diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-05-12 14:12:19 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-05-12 14:12:19 -0400 |
| commit | c5e64d6b70da16979652053e04f794f6d7863282 (patch) | |
| tree | 7085af861c3325a6e362413769946d04049588cf /net | |
| parent | d2e5cb4e22080578f5d7e66824f85cf0e11d65e4 (diff) | |
| parent | f9ac71bfcc5c937ff02765dc316cf5bc01d21d97 (diff) | |
| download | linux-c5e64d6b70da16979652053e04f794f6d7863282.tar.gz linux-c5e64d6b70da16979652053e04f794f6d7863282.tar.bz2 linux-c5e64d6b70da16979652053e04f794f6d7863282.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/trace.h | 4 | ||||
| -rw-r--r-- | net/mac80211/vht.c | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h index a0b0aea76525..cec5b60487a4 100644 --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h @@ -21,10 +21,10 @@ #define VIF_ENTRY __field(enum nl80211_iftype, vif_type) __field(void *, sdata) \ __field(bool, p2p) \ - __string(vif_name, sdata->dev ? sdata->dev->name : "<nodev>") + __string(vif_name, sdata->name) #define VIF_ASSIGN __entry->vif_type = sdata->vif.type; __entry->sdata = sdata; \ __entry->p2p = sdata->vif.p2p; \ - __assign_str(vif_name, sdata->dev ? sdata->dev->name : sdata->name) + __assign_str(vif_name, sdata->name) #define VIF_PR_FMT " vif:%s(%d%s)" #define VIF_PR_ARG __get_str(vif_name), __entry->vif_type, __entry->p2p ? "/p2p" : "" diff --git a/net/mac80211/vht.c b/net/mac80211/vht.c index e9e36a256165..9265adfdabfc 100644 --- a/net/mac80211/vht.c +++ b/net/mac80211/vht.c @@ -129,9 +129,12 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, if (!vht_cap_ie || !sband->vht_cap.vht_supported) return; - /* A VHT STA must support 40 MHz */ - if (!(sta->sta.ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)) - return; + /* + * A VHT STA must support 40 MHz, but if we verify that here + * then we break a few things - some APs (e.g. Netgear R6300v2 + * and others based on the BCM4360 chipset) will unset this + * capability bit when operating in 20 MHz. + */ vht_cap->vht_supported = true; |