aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorMahesh Palivela <maheshp@posedge.com>2012-11-29 03:41:07 -0500
committerJohannes Berg <johannes.berg@intel.com>2012-11-29 03:54:53 -0500
commitdbeca2ea4642d9de0a59ac141b2825ea6804f408 (patch)
tree4d0e6a3d37827ee36df2bc5661198920fa7e94b0 /net/wireless
parent59cf1d65f7d69739a29a16fe678ebc4e1215e9c0 (diff)
cfg80211: Remove unused VHT chan code
Cleanup of unused VHT channel config related code. Signed-off-by: Mahesh Palivela <maheshp@posedge.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/nl80211.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 7cce43bc9489..0e7e8d533d98 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -1371,9 +1371,7 @@ static int nl80211_parse_chandef(struct cfg80211_registered_device *rdev,
1371 struct genl_info *info, 1371 struct genl_info *info,
1372 struct cfg80211_chan_def *chandef) 1372 struct cfg80211_chan_def *chandef)
1373{ 1373{
1374 struct ieee80211_sta_ht_cap *ht_cap; 1374 u32 control_freq;
1375 struct ieee80211_sta_vht_cap *vht_cap;
1376 u32 control_freq, width;
1377 1375
1378 if (!info->attrs[NL80211_ATTR_WIPHY_FREQ]) 1376 if (!info->attrs[NL80211_ATTR_WIPHY_FREQ])
1379 return -EINVAL; 1377 return -EINVAL;
@@ -1419,33 +1417,9 @@ static int nl80211_parse_chandef(struct cfg80211_registered_device *rdev,
1419 info->attrs[NL80211_ATTR_CENTER_FREQ2]); 1417 info->attrs[NL80211_ATTR_CENTER_FREQ2]);
1420 } 1418 }
1421 1419
1422 ht_cap = &rdev->wiphy.bands[chandef->chan->band]->ht_cap;
1423 vht_cap = &rdev->wiphy.bands[chandef->chan->band]->vht_cap;
1424
1425 if (!cfg80211_chandef_valid(chandef)) 1420 if (!cfg80211_chandef_valid(chandef))
1426 return -EINVAL; 1421 return -EINVAL;
1427 1422
1428 switch (chandef->width) {
1429 case NL80211_CHAN_WIDTH_20:
1430 case NL80211_CHAN_WIDTH_20_NOHT:
1431 width = 20;
1432 break;
1433 case NL80211_CHAN_WIDTH_40:
1434 width = 40;
1435 break;
1436 case NL80211_CHAN_WIDTH_80:
1437 width = 80;
1438 break;
1439 case NL80211_CHAN_WIDTH_80P80:
1440 width = 80;
1441 break;
1442 case NL80211_CHAN_WIDTH_160:
1443 width = 160;
1444 break;
1445 default:
1446 return -EINVAL;
1447 }
1448
1449 if (!cfg80211_chandef_usable(&rdev->wiphy, chandef, 1423 if (!cfg80211_chandef_usable(&rdev->wiphy, chandef,
1450 IEEE80211_CHAN_DISABLED)) 1424 IEEE80211_CHAN_DISABLED))
1451 return -EINVAL; 1425 return -EINVAL;