wok-current view linux/stuff/channel-negative-one-maxim.patch @ rev 12373

Up: curl to 7.25.0.
author Christopher Rogers <slaxemulator@gmail.com>
date Thu Apr 19 21:55:04 2012 +0000 (2012-04-19)
parents
children a1084fda7f23
line source
1 commit fffd6e63ea75850dafbf2ccfb38a4189f43c0282
2 Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
3 Date: Tue Jun 1 15:43:21 2010 +0300
4
5 wireless: allow to retrieve the channel set on monitor interface
6
7 This will allow to preserve compatibility with userspace
8
9 Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx>
10
11 diff --git a/net/wireless/chan.c b/net/wireless/chan.c
12 index b01a6f6..09d979b 100644
13 --- a/net/wireless/chan.c
14 +++ b/net/wireless/chan.c
15 @@ -49,9 +49,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
16 {
17 struct ieee80211_channel *chan;
18 int result;
19 + struct wireless_dev *mon_dev = NULL;
20
21 - if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR)
22 + if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) {
23 + mon_dev = wdev;
24 wdev = NULL;
25 + }
26
27 if (wdev) {
28 ASSERT_WDEV_LOCK(wdev);
29 @@ -76,5 +79,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
30 if (wdev)
31 wdev->channel = chan;
32
33 + if (mon_dev)
34 + mon_dev->channel = chan;
35 +
36 return 0;
37 }
38