]> git.baikalelectronics.ru Git - kernel.git/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)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 16 Mar 2015 08:35:59 +0000 (09:35 +0100)
commit0b03c8323143c4ca010bcb7a90a3b5f456c79edb
tree56ccc0f5079ec4cf869b9692294eb7f3a4a31d8b
parent82c8b4e7f38a50506f719addcb39f920cf2fde59
mac80211: count interfaces correctly for combination checks

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.

Cc: stable@vger.kernel.org [3.16+]
Fixes: 5177cbcc0af8c ("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>
net/mac80211/util.c