Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12395d06 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mac80211-for-davem-2016-04-27' of... 

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: default avatarDavid S. Miller <davem@davemloft.net>
parents a05d7dfc e6436be2

net/mac80211/iface.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

		}

	}