]> git.baikalelectronics.ru Git - kernel.git/commit
mac80211: fix infinite loop in ieee80211_determine_chantype
authorChris Wright <chrisw@sous-sol.org>
Wed, 31 Jul 2013 19:12:24 +0000 (12:12 -0700)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 31 Jul 2013 19:15:36 +0000 (21:15 +0200)
commit5a436a8a446cd51c0f48db802d90a2027c0346b7
tree1ded456a420f842dbe49e09e91d194d7969f437e
parent25e3742222c656a1926aafe7c52434568f06d4fc
mac80211: fix infinite loop in ieee80211_determine_chantype

Commit "52caf0b mac80211: fix channel selection bug" introduced a possible
infinite loop by moving the out target above the chandef_downgrade
while loop.  When we downgrade to NL80211_CHAN_WIDTH_20_NOHT, we jump
back up to re-run the while loop...indefinitely.  Replace goto with
break and carry on.  This may not be sufficient to connect to the AP,
but will at least keep the cpu from livelocking.  Thanks to Derek Atkins
as an extra pair of debugging eyes.

Cc: stable@kernel.org
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/mlme.c