]> git.itanic.dy.fi Git - linux-stable/commit
mac80211: count interfaces correctly for combination checks
authorAndrei Otcheretianski <andrei.otcheretianski@intel.com>
Thu, 12 Mar 2015 06:53:30 +0000 (08:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 13 Apr 2015 12:03:52 +0000 (14:03 +0200)
commit89e1dc988d602f16b5239928359f5a1c6fdbb008
tree36124eb2280f7b61368511ac87a37bebabe3b434
parentd22db2725c02cc7cf374077d0fc130cf69e7a0cf
mac80211: count interfaces correctly for combination checks

commit 0f611d28fc2e13cfec64e1c544c16a086886805a upstream.

Since moving the interface combination checks to mac80211, it's
broken because it now only considers interfaces with an assigned
channel context, so for example any interface that isn't active
can still be up, which is clearly an issue; also, in particular
P2P-Device wdevs are an issue since they never have a chanctx.

Fix this by counting running interfaces instead the ones with a
channel context assigned.

Fixes: 73de86a38962b ("cfg80211/mac80211: move interface counting for combination check to mac80211")
Signed-off-by: Andrei Otcheretianski <andrei.otcheretianski@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
[rewrite commit message, dig out the commit it fixes]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/mac80211/util.c