wok-backports annotate linux/stuff/channel-negative-one-maxim.patch @ rev 55
Remove ashism ==
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Wed Feb 27 17:46:33 2019 +0100 (2019-02-27) |
| parents | |
| children |
| rev | line source |
|---|---|
| pascal@0 | 1 commit fffd6e63ea75850dafbf2ccfb38a4189f43c0282 |
| pascal@0 | 2 Author: Maxim Levitsky <maximlevitsky@xxxxxxxxx> |
| pascal@0 | 3 Date: Tue Jun 1 15:43:21 2010 +0300 |
| pascal@0 | 4 |
| pascal@0 | 5 wireless: allow to retrieve the channel set on monitor interface |
| pascal@0 | 6 |
| pascal@0 | 7 This will allow to preserve compatibility with userspace |
| pascal@0 | 8 |
| pascal@0 | 9 Signed-off-by: Maxim Levitsky <maximlevitsky@xxxxxxxxx> |
| pascal@0 | 10 |
| pascal@0 | 11 diff --git a/net/wireless/chan.c b/net/wireless/chan.c |
| pascal@0 | 12 index b01a6f6..09d979b 100644 |
| pascal@0 | 13 --- a/net/wireless/chan.c |
| pascal@0 | 14 +++ b/net/wireless/chan.c |
| pascal@0 | 15 @@ -49,9 +49,12 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, |
| pascal@0 | 16 { |
| pascal@0 | 17 struct ieee80211_channel *chan; |
| pascal@0 | 18 int result; |
| pascal@0 | 19 + struct wireless_dev *mon_dev = NULL; |
| pascal@0 | 20 |
| pascal@0 | 21 - if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) |
| pascal@0 | 22 + if (wdev && wdev->iftype == NL80211_IFTYPE_MONITOR) { |
| pascal@0 | 23 + mon_dev = wdev; |
| pascal@0 | 24 wdev = NULL; |
| pascal@0 | 25 + } |
| pascal@0 | 26 |
| pascal@0 | 27 if (wdev) { |
| pascal@0 | 28 ASSERT_WDEV_LOCK(wdev); |
| pascal@0 | 29 @@ -76,5 +79,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev, |
| pascal@0 | 30 if (wdev) |
| pascal@0 | 31 wdev->channel = chan; |
| pascal@0 | 32 |
| pascal@0 | 33 + if (mon_dev) |
| pascal@0 | 34 + mon_dev->channel = chan; |
| pascal@0 | 35 + |
| pascal@0 | 36 return 0; |
| pascal@0 | 37 } |
| pascal@0 | 38 |