summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2012-05-16 23:50:19 +0200
committerJohn W. Linville <linville@tuxdriver.com>2012-06-05 15:32:17 -0400
commit685d12a1929f274bd91497e33b4255fe164ac8ec (patch)
tree885a63aeaffd8d602d242484b54341b186c8769b
parentaa430da41019c1694f6a8e3b8bef1d12ed52b0ad (diff)
downloadop-kernel-dev-685d12a1929f274bd91497e33b4255fe164ac8ec.zip
op-kernel-dev-685d12a1929f274bd91497e33b4255fe164ac8ec.tar.gz
cfg80211: disallow setting channel on WDS interfaces
If it worked (Felix says it doesn't right now), the typical use-case for WDS interfaces would be to be slaved to AP mode interfaces. Therefore, it isn't necessary to set the channel on WDS interfaces. As they don't support powersave or anything like that, they also couldn't use a different channel anyway. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--net/wireless/nl80211.c5
-rw-r--r--net/wireless/wext-compat.c1
2 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 74f4a8f..089a520 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1166,8 +1166,8 @@ static int parse_txq_params(struct nlattr *tb[],
static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev)
{
/*
- * You can only set the channel explicitly for AP, mesh
- * and WDS type interfaces; all others have their channel
+ * You can only set the channel explicitly for AP and
+ * mesh type interfaces; all others have their channel
* managed via their respective "establish a connection"
* command (connect, join, ...)
*
@@ -1180,7 +1180,6 @@ static bool nl80211_can_set_dev_channel(struct wireless_dev *wdev)
*/
return !wdev ||
wdev->iftype == NL80211_IFTYPE_AP ||
- wdev->iftype == NL80211_IFTYPE_WDS ||
wdev->iftype == NL80211_IFTYPE_MESH_POINT ||
wdev->iftype == NL80211_IFTYPE_MONITOR ||
wdev->iftype == NL80211_IFTYPE_P2P_GO;
diff --git a/net/wireless/wext-compat.c b/net/wireless/wext-compat.c
index 6a6181a..b082fcc 100644
--- a/net/wireless/wext-compat.c
+++ b/net/wireless/wext-compat.c
@@ -796,7 +796,6 @@ static int cfg80211_wext_siwfreq(struct net_device *dev,
case NL80211_IFTYPE_ADHOC:
return cfg80211_ibss_wext_siwfreq(dev, info, wextfreq, extra);
case NL80211_IFTYPE_MONITOR:
- case NL80211_IFTYPE_WDS:
case NL80211_IFTYPE_MESH_POINT:
freq = cfg80211_wext_freq(wdev->wiphy, wextfreq);
if (freq < 0)
OpenPOWER on IntegriCloud