Skip to content

Commit

Permalink
cfg80211: Remove unused VHT chan code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mahesh Palivela authored and Johannes Berg committed Nov 29, 2012
1 parent 59cf1d6 commit dbeca2e
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions net/wireless/nl80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -1371,9 +1371,7 @@ static int nl80211_parse_chandef(struct cfg80211_registered_device *rdev,
struct genl_info *info,
struct cfg80211_chan_def *chandef)
{
struct ieee80211_sta_ht_cap *ht_cap;
struct ieee80211_sta_vht_cap *vht_cap;
u32 control_freq, width;
u32 control_freq;

if (!info->attrs[NL80211_ATTR_WIPHY_FREQ])
return -EINVAL;
Expand Down Expand Up @@ -1419,33 +1417,9 @@ static int nl80211_parse_chandef(struct cfg80211_registered_device *rdev,
info->attrs[NL80211_ATTR_CENTER_FREQ2]);
}

ht_cap = &rdev->wiphy.bands[chandef->chan->band]->ht_cap;
vht_cap = &rdev->wiphy.bands[chandef->chan->band]->vht_cap;

if (!cfg80211_chandef_valid(chandef))
return -EINVAL;

switch (chandef->width) {
case NL80211_CHAN_WIDTH_20:
case NL80211_CHAN_WIDTH_20_NOHT:
width = 20;
break;
case NL80211_CHAN_WIDTH_40:
width = 40;
break;
case NL80211_CHAN_WIDTH_80:
width = 80;
break;
case NL80211_CHAN_WIDTH_80P80:
width = 80;
break;
case NL80211_CHAN_WIDTH_160:
width = 160;
break;
default:
return -EINVAL;
}

if (!cfg80211_chandef_usable(&rdev->wiphy, chandef,
IEEE80211_CHAN_DISABLED))
return -EINVAL;
Expand Down

0 comments on commit dbeca2e

Please sign in to comment.