diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-03 22:09:08 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2008-11-03 22:09:08 +0000 |
commit | 3330f0fa390bb1da4c9049efd8f9f388c49ee6e6 (patch) | |
tree | 5332e051bc6d81f6f638e152656edfef6972596f /package/mac80211/patches/421-nl80211-export-ht.patch | |
parent | e0338bc09b6af973ecc6be38ff3d5e1012e1e938 (diff) |
upgrade compat-wireless to 2008-11-03
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13114 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/421-nl80211-export-ht.patch')
-rw-r--r-- | package/mac80211/patches/421-nl80211-export-ht.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/package/mac80211/patches/421-nl80211-export-ht.patch b/package/mac80211/patches/421-nl80211-export-ht.patch deleted file mode 100644 index d6f6b5a58..000000000 --- a/package/mac80211/patches/421-nl80211-export-ht.patch +++ /dev/null @@ -1,64 +0,0 @@ -Subject: nl80211: export HT capabilities - -This exports the local HT capabilities in nl80211. - -Signed-off-by: Johannes Berg <johannes@sipsolutions.net> ---- - include/linux/nl80211.h | 12 ++++++++++++ - net/wireless/nl80211.c | 13 +++++++++++++ - 2 files changed, 25 insertions(+) - ---- everything.orig/include/linux/nl80211.h 2008-10-09 01:31:09.000000000 +0200 -+++ everything/include/linux/nl80211.h 2008-10-09 02:11:44.000000000 +0200 -@@ -452,17 +452,29 @@ enum nl80211_mpath_info { - * an array of nested frequency attributes - * @NL80211_BAND_ATTR_RATES: supported bitrates in this band, - * an array of nested bitrate attributes -+ * @NL80211_BAND_ATTR_HT_MCS_SET: 16-byte attribute containing the MCS set as -+ * defined in 802.11n -+ * @NL80211_BAND_ATTR_HT_CAPA: HT capabilities, as in the HT information IE -+ * @NL80211_BAND_ATTR_HT_AMPDU_FACTOR: A-MPDU factor, as in 11n -+ * @NL80211_BAND_ATTR_HT_AMPDU_DENSITY: A-MPDU density, as in 11n - */ - enum nl80211_band_attr { - __NL80211_BAND_ATTR_INVALID, - NL80211_BAND_ATTR_FREQS, - NL80211_BAND_ATTR_RATES, - -+ NL80211_BAND_ATTR_HT_MCS_SET, -+ NL80211_BAND_ATTR_HT_CAPA, -+ NL80211_BAND_ATTR_HT_AMPDU_FACTOR, -+ NL80211_BAND_ATTR_HT_AMPDU_DENSITY, -+ - /* keep last */ - __NL80211_BAND_ATTR_AFTER_LAST, - NL80211_BAND_ATTR_MAX = __NL80211_BAND_ATTR_AFTER_LAST - 1 - }; - -+#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA -+ - /** - * enum nl80211_frequency_attr - frequency attributes - * @NL80211_FREQUENCY_ATTR_FREQ: Frequency in MHz ---- everything.orig/net/wireless/nl80211.c 2008-10-09 01:32:05.000000000 +0200 -+++ everything/net/wireless/nl80211.c 2008-10-09 02:12:21.000000000 +0200 -@@ -157,6 +157,19 @@ static int nl80211_send_wiphy(struct sk_ - if (!nl_band) - goto nla_put_failure; - -+ /* add HT info */ -+ if (dev->wiphy.bands[band]->ht_cap.ht_supported) { -+ NLA_PUT(msg, NL80211_BAND_ATTR_HT_MCS_SET, -+ sizeof(dev->wiphy.bands[band]->ht_cap.mcs), -+ &dev->wiphy.bands[band]->ht_cap.mcs); -+ NLA_PUT_U16(msg, NL80211_BAND_ATTR_HT_CAPA, -+ dev->wiphy.bands[band]->ht_cap.cap); -+ NLA_PUT_U8(msg, NL80211_BAND_ATTR_HT_AMPDU_FACTOR, -+ dev->wiphy.bands[band]->ht_cap.ampdu_factor); -+ NLA_PUT_U8(msg, NL80211_BAND_ATTR_HT_AMPDU_DENSITY, -+ dev->wiphy.bands[band]->ht_cap.ampdu_density); -+ } -+ - /* add frequencies */ - nl_freqs = nla_nest_start(msg, NL80211_BAND_ATTR_FREQS); - if (!nl_freqs) |