From a42add495d73a8bc3a496e3f5083ca2951dadc15 Mon Sep 17 00:00:00 2001
From: Mahesh Palivela <maheshp@posedge.com>
Date: Thu, 29 Nov 2012 14:11:07 +0530
Subject: [PATCH] --- yaml --- r: 341975 b: refs/heads/master c:
 dbeca2ea4642d9de0a59ac141b2825ea6804f408 h: refs/heads/master i:   341973:
 6311f639b39a6626f49af90de9ebf2023765eb3c   341971:
 e07878903e6521289fa33c496183c1a1d082cec6   341967:
 c729527f0791f733cbc721cf0203d68fa5549b89 v: v3

---
 [refs]                       |  2 +-
 trunk/net/wireless/nl80211.c | 28 +---------------------------
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/[refs] b/[refs]
index 0df1a3ffe1b9..d47bf4356206 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59cf1d65f7d69739a29a16fe678ebc4e1215e9c0
+refs/heads/master: dbeca2ea4642d9de0a59ac141b2825ea6804f408
diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c
index 7cce43bc9489..0e7e8d533d98 100644
--- a/trunk/net/wireless/nl80211.c
+++ b/trunk/net/wireless/nl80211.c
@@ -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;
@@ -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;