diff options
Diffstat (limited to 'net/wireless/wext-compat.c')
-rw-r--r-- | net/wireless/wext-compat.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c index faeb03548aa4..bc879833b21f 100644 --- a/net/wireless/wext-compat.c +++ b/net/wireless/wext-compat.c | |||
@@ -802,9 +802,7 @@ static int cfg80211_wext_siwfreq(struct net_device *dev, | |||
802 | if (freq == 0) | 802 | if (freq == 0) |
803 | return -EINVAL; | 803 | return -EINVAL; |
804 | mutex_lock(&rdev->devlist_mtx); | 804 | mutex_lock(&rdev->devlist_mtx); |
805 | wdev_lock(wdev); | 805 | err = cfg80211_set_monitor_channel(rdev, freq, NL80211_CHAN_NO_HT); |
806 | err = cfg80211_set_freq(rdev, wdev, freq, NL80211_CHAN_NO_HT); | ||
807 | wdev_unlock(wdev); | ||
808 | mutex_unlock(&rdev->devlist_mtx); | 806 | mutex_unlock(&rdev->devlist_mtx); |
809 | return err; | 807 | return err; |
810 | case NL80211_IFTYPE_MESH_POINT: | 808 | case NL80211_IFTYPE_MESH_POINT: |
@@ -848,11 +846,7 @@ static int cfg80211_wext_giwfreq(struct net_device *dev, | |||
848 | freq->e = 6; | 846 | freq->e = 6; |
849 | return 0; | 847 | return 0; |
850 | default: | 848 | default: |
851 | if (!wdev->channel) | 849 | return -EINVAL; |
852 | return -EINVAL; | ||
853 | freq->m = wdev->channel->center_freq; | ||
854 | freq->e = 6; | ||
855 | return 0; | ||
856 | } | 850 | } |
857 | } | 851 | } |
858 | 852 | ||