diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-12 19:26:07 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-12 19:26:07 -0500 |
| commit | c7c6575f254e5621a8408c29bdab0d704c3fab6e (patch) | |
| tree | d0b399a480a8633be6373c035f6253e1a40987af /net/batman-adv/soft-interface.c | |
| parent | 0850f0f5c54261a6236f013e8bac154bcce424d6 (diff) | |
| parent | b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c (diff) | |
Merge branch 'batman-adv/next' of git://git.open-mesh.org/linux-merge
Diffstat (limited to 'net/batman-adv/soft-interface.c')
| -rw-r--r-- | net/batman-adv/soft-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index 45297c84309..987c75a775f 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@ -874,7 +874,7 @@ unreg_debugfs: unreg_sysfs: sysfs_del_meshif(soft_iface); unreg_soft_iface: - unregister_netdev(soft_iface); + unregister_netdevice(soft_iface); return NULL; free_soft_iface: |