From 62175a3036fc095163b27f438c06ad7e6d77f8c0 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Mon, 9 Apr 2012 12:54:20 -0700 Subject: [PATCH 2/2] UBUNTU: SAUCE: wireless: allow to retrieve the channel set on monitor interface http://patches.aircrack-ng.org/channel-negative-one-maxim.patch This will allow to preserve compatibility with userspace Signed-off-by: Maxim Levitsky Signed-off-by: Leann Ogasawara --- net/wireless/chan.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/net/wireless/chan.c b/net/wireless/chan.c index 17cd0c0..1ba03ba 100644 --- a/net/wireless/chan.c +++ b/net/wireless/chan.c @@ -82,9 +82,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, { struct ieee80211_channel *chan; int result; + struct wireless_dev *mon_dev = NULL; - if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) + if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) { + mon_dev = wdev; wdev = NULL; + } if (wdev) { ASSERT_WDEV_LOCK(wdev); @@ -131,5 +134,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, if (wdev) wdev->channel = chan; + if (mon_dev) + mon_dev->channel = chan; + return 0; } -- 1.7.9.1