]> Pileus Git - ~andy/linux/commitdiff
cfg80211: remove racy beacon_interval assignment
authorJohannes Berg <johannes.berg@intel.com>
Mon, 3 Mar 2014 12:55:54 +0000 (13:55 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Mon, 3 Mar 2014 13:18:20 +0000 (14:18 +0100)
In case of AP mode, the beacon interval is already reset to
zero inside cfg80211_stop_ap(), and in the other modes it
isn't relevant. Remove the assignment to remove a potential
race since the assignment isn't properly locked.

Reported-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/wireless/core.c

index 010892b81a06642a3886c7df9b74f0af9ecb1d3c..a3bf18d116095f14f4238bc792d22e5f51f2dd26 100644 (file)
@@ -788,8 +788,6 @@ void cfg80211_leave(struct cfg80211_registered_device *rdev,
        default:
                break;
        }
-
-       wdev->beacon_interval = 0;
 }
 
 static int cfg80211_netdev_notifier_call(struct notifier_block *nb,