diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-28 22:55:26 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 22:55:26 +0200 |
| commit | 12395d0647dd0e4a594e091925fc4f2705b986a1 (patch) | |
| tree | e93f4bc7cfc9309157fddb829ff9e58daa96d482 /net | |
| parent | net: phy: at803x: only the AT8030 needs a hardware reset on link change (diff) | |
| parent | mac80211: fix statistics leak if dev_alloc_name() fails (diff) | |
| download | linux-12395d0647dd0e4a594e091925fc4f2705b986a1.tar.xz linux-12395d0647dd0e4a594e091925fc4f2705b986a1.zip | |
Merge tag 'mac80211-for-davem-2016-04-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
Just a single fix, for a per-CPU memory leak in a
(root user triggerable) error case.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 453b4e741780..e1cb22c16530 100644 --- 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; } } |