projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski...
[linux-2.6-block.git]
/
net
/
mac80211
/
iface.c
diff --git
a/net/mac80211/iface.c
b/net/mac80211/iface.c
index 453b4e7417804105cb136e2ec7f4c57a39392db3..e1cb22c16530377cc8ce0d9bf907bbd662f18337 100644
(file)
--- a/
net/mac80211/iface.c
+++ b/
net/mac80211/iface.c
@@
-1761,7
+1761,7
@@
int ieee80211_if_add(struct ieee80211_local *local, const char *name,
ret = dev_alloc_name(ndev, ndev->name);
if (ret < 0) {
-
free_netdev
(ndev);
+
ieee80211_if_free
(ndev);
return ret;
}
@@
-1847,7
+1847,7
@@
int ieee80211_if_add(struct ieee80211_local *local, const char *name,
ret = register_netdevice(ndev);
if (ret) {
-
free_netdev
(ndev);
+
ieee80211_if_free
(ndev);
return ret;
}
}