diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-06 13:47:16 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-06 13:47:16 -0500 |
commit | 73c8daa083973a4e16e39c3a52abb64bd3592de8 (patch) | |
tree | 6054e61ede5badf364b0724ff18b394b06f915c7 /net/wireless/core.c | |
parent | 9b8ba9f518829f7b7776e3b1f8c9f83c9696cf28 (diff) | |
parent | 864a6040f395464003af8dd0d8ca86fed19866d4 (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net/wireless/core.c')
-rw-r--r-- | net/wireless/core.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/wireless/core.c b/net/wireless/core.c index 010892b81a06..a3bf18d11609 100644 --- a/net/wireless/core.c +++ b/net/wireless/core.c @@ -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, |