[PATCH] nl80211: export HT capabilities

[PATCH] nl80211: export HT capabilities

[Johannes Berg]

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)

Re: [PATCH] nl80211: export HT capabilities

[Luis R. Rodriguez]

On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
> +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA

Typo

  Luis

Re: [PATCH] nl80211: export HT capabilities

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

On Thu, 2008-10-09 at 01:57 -0700, Luis R. Rodriguez wrote:
> On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
> > +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
> 
> Typo

Hmm? Am I too dense?

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] nl80211: export HT capabilities

[John W. Linville]

On Fri, Oct 10, 2008 at 11:23:42AM +0200, Johannes Berg wrote:
> On Thu, 2008-10-09 at 01:57 -0700, Luis R. Rodriguez wrote:
> > On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
> > > +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
> > 
> > Typo
> 
> Hmm? Am I too dense?

Well, it looks a little useless to define something as itself...

-- 
John W. Linville		Linux should be at the core
linville@tuxdriver.com			of your literate lifestyle.

Re: [PATCH] nl80211: export HT capabilities

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On Fri, 2008-10-10 at 17:36 -0400, John W. Linville wrote:
> On Fri, Oct 10, 2008 at 11:23:42AM +0200, Johannes Berg wrote:
> > On Thu, 2008-10-09 at 01:57 -0700, Luis R. Rodriguez wrote:
> > > On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
> > > > +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
> > > 
> > > Typo
> > 
> > Hmm? Am I too dense?
> 
> Well, it looks a little useless to define something as itself...

Yeah but you can use that to check "has the nl80211.h I'm compiling
against defined the HT stuff yet?"

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] nl80211: export HT capabilities

[John W. Linville]

On Fri, Oct 10, 2008 at 11:44:06PM +0200, Johannes Berg wrote:
> On Fri, 2008-10-10 at 17:36 -0400, John W. Linville wrote:
> > On Fri, Oct 10, 2008 at 11:23:42AM +0200, Johannes Berg wrote:
> > > On Thu, 2008-10-09 at 01:57 -0700, Luis R. Rodriguez wrote:
> > > > On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
> > > > > +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
> > > > 
> > > > Typo
> > > 
> > > Hmm? Am I too dense?
> > 
> > Well, it looks a little useless to define something as itself...
> 
> Yeah but you can use that to check "has the nl80211.h I'm compiling
> against defined the HT stuff yet?"

Ah...you are just too clever... :-)

-- 
John W. Linville		Linux should be at the core
linville@tuxdriver.com			of your literate lifestyle.

Re: [PATCH] nl80211: export HT capabilities

[Luis R. Rodriguez]

On Fri, Oct 10, 2008 at 5:44 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Fri, 2008-10-10 at 17:36 -0400, John W. Linville wrote:
>> On Fri, Oct 10, 2008 at 11:23:42AM +0200, Johannes Berg wrote:
>> > On Thu, 2008-10-09 at 01:57 -0700, Luis R. Rodriguez wrote:
>> > > On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
>> > > > +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
>> > >
>> > > Typo
>> >
>> > Hmm? Am I too dense?
>>
>> Well, it looks a little useless to define something as itself...
>
> Yeah but you can use that to check "has the nl80211.h I'm compiling
> against defined the HT stuff yet?"

So you're going to #ifdef on the iw nl80211.h?

Can't we use something better and more obvious like defining an
nl80211 version (as kernel version won't do us any good for bleeding
edge wireless-testing users) or something like that?

  Luis

Re: [PATCH] nl80211: export HT capabilities

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

On Sat, 2008-10-11 at 18:29 -0400, Luis R. Rodriguez wrote:

> So you're going to #ifdef on the iw nl80211.h?

No. iw actually has a copy of the header file now.

> Can't we use something better and more obvious like defining an
> nl80211 version (as kernel version won't do us any good for bleeding
> edge wireless-testing users) or something like that?

Eh, no. Version numbers suck. Always test for features. Besides, this is
about compiling, not running.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] nl80211: export HT capabilities

[Michael Buesch]

On Friday 10 October 2008 23:36:10 John W. Linville wrote:
> On Fri, Oct 10, 2008 at 11:23:42AM +0200, Johannes Berg wrote:
> > On Thu, 2008-10-09 at 01:57 -0700, Luis R. Rodriguez wrote:
> > > On Thu, Oct 09, 2008 at 03:20:13AM -0700, Johannes Berg wrote:
> > > > +#define NL80211_BAND_ATTR_HT_CAPA NL80211_BAND_ATTR_HT_CAPA
> > > 
> > > Typo
> > 
> > Hmm? Am I too dense?
> 
> Well, it looks a little useless to define something as itself...
> 

No, it's a cpp trick. You can use #ifdef to find out whether something is
implemented or not.

-- 
Greetings Michael.