[PATCH] mac80211: add station aid into ieee80211_tx_control

[PATCH] mac80211: add station aid into ieee80211_tx_control

[Chr]

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

This patch is necessary for the upcoming Accesspoint patch for p54.

Signed-off-by: Christian Lamparter <chunkeey@web.de>

[-- Attachment #2: mac80211-station-aid-in-tx-control.diff --]
[-- Type: text/x-diff, Size: 761 bytes --]

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 48428a6..b428472 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -287,6 +287,7 @@ struct ieee80211_tx_control {
 	u8 iv_len;		/* length of the IV field in octets */
 	u8 queue;		/* hardware queue to use for this frame;
 				 * 0 = highest, hw->queues-1 = lowest */
+	u16 aid;		/* Station AID */
 	int type;	/* internal */
 };
 
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 80f4343..ea3fa0f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -741,6 +741,7 @@ ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)
 	}
 
 	if (tx->sta) {
+		control->aid = tx->sta->aid;
 		tx->sta->tx_packets++;
 		tx->sta->tx_fragments++;
 		tx->sta->tx_bytes += tx->skb->len;

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Johannes Berg]

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


On Tue, 2008-04-01 at 21:45 +0200, Chr wrote:
> This patch is necessary for the upcoming Accesspoint patch for p54.

Hm. I don't like increasing the tx control structure size but I guess
you really need that :)

> Signed-off-by: Christian Lamparter <chunkeey@web.de>

Acked-by: Johannes Berg <johannes@sipsolutions.net>

Please CC the appropriate maintainers (i.e. at least me for mac80211) on
code changes.


> diff --git a/include/net/mac80211.h b/include/net/mac80211.h
> index 48428a6..b428472 100644
> --- a/include/net/mac80211.h
> +++ b/include/net/mac80211.h
> @@ -287,6 +287,7 @@ struct ieee80211_tx_control {
>         u8 iv_len;              /* length of the IV field in octets */
>         u8 queue;               /* hardware queue to use for this frame;
>                                  * 0 = highest, hw->queues-1 = lowest */
> +       u16 aid;                /* Station AID */
>         int type;       /* internal */
>  };
>  
> diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
> index 80f4343..ea3fa0f 100644
> --- a/net/mac80211/tx.c
> +++ b/net/mac80211/tx.c
> @@ -741,6 +741,7 @@ ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)
>         }
>  
>         if (tx->sta) {
> +               control->aid = tx->sta->aid;
>                 tx->sta->tx_packets++;
>                 tx->sta->tx_fragments++;
>                 tx->sta->tx_bytes += tx->skb->len;

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

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Tomas Winkler]

On Wed, Apr 2, 2008 at 12:34 PM, Johannes Berg
<johannes@sipsolutions.net> wrote:
>
>  On Tue, 2008-04-01 at 21:45 +0200, Chr wrote:
>  > This patch is necessary for the upcoming Accesspoint patch for p54.
>
>  Hm. I don't like increasing the tx control structure size but I guess
>  you really need that :)
>
>
>  > Signed-off-by: Christian Lamparter <chunkeey@web.de>
>
>  Acked-by: Johannes Berg <johannes@sipsolutions.net>
>
>  Please CC the appropriate maintainers (i.e. at least me for mac80211) on
>  code changes.
>

Not sure why this cannot be bookeeped in the driver.
Upon association AID is delivered to driver, so every packet that will
be sent to this AP has this AID?

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Chr]

On Wednesday 02 April 2008 22:05:46 Tomas Winkler wrote:
> On Wed, Apr 2, 2008 at 12:34 PM, Johannes Berg
>
> <johannes@sipsolutions.net> wrote:
> >  On Tue, 2008-04-01 at 21:45 +0200, Chr wrote:
> >  > This patch is necessary for the upcoming Accesspoint patch for p54.
> >
> >  Hm. I don't like increasing the tx control structure size but I guess
> >  you really need that :)
> >
> >  > Signed-off-by: Christian Lamparter <chunkeey@web.de>
> >
> >  Acked-by: Johannes Berg <johannes@sipsolutions.net>
> >
> >  Please CC the appropriate maintainers (i.e. at least me for mac80211) on
> >  code changes.
>
> Not sure why this cannot be bookeeped in the driver.
> Upon association AID is delivered to driver, so every packet that will
> be sent to this AP has this AID?

hmm? where? sta_notify just gives us the mac-address and a command.
(maybe you have mixed it up with set_tim?!)

Or do I miss something obvious here?

Regards,
	Chr.

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Tomas Winkler]

On Thu, Apr 3, 2008 at 1:51 AM, Chr <chunkeey@web.de> wrote:
>
> On Wednesday 02 April 2008 22:05:46 Tomas Winkler wrote:
>  > On Wed, Apr 2, 2008 at 12:34 PM, Johannes Berg
>  >
>  > <johannes@sipsolutions.net> wrote:
>  > >  On Tue, 2008-04-01 at 21:45 +0200, Chr wrote:
>  > >  > This patch is necessary for the upcoming Accesspoint patch for p54.
>  > >
>  > >  Hm. I don't like increasing the tx control structure size but I guess
>  > >  you really need that :)
>  > >
>  > >  > Signed-off-by: Christian Lamparter <chunkeey@web.de>
>  > >
>  > >  Acked-by: Johannes Berg <johannes@sipsolutions.net>
>  > >
>  > >  Please CC the appropriate maintainers (i.e. at least me for mac80211) on
>  > >  code changes.
>  >
>  > Not sure why this cannot be bookeeped in the driver.
>  > Upon association AID is delivered to driver, so every packet that will
>  > be sent to this AP has this AID?
>
>  hmm? where? sta_notify just gives us the mac-address and a command.
>  (maybe you have mixed it up with set_tim?!)
>
>  Or do I miss something obvious here?

This patch series introduces this. It was posted week ago so I've
assumed it was already merged.

>[PATCH 1/4] mac80211: eliminate conf_ht
> [PATCH 2/4] iwlwifi: eliminate conf_ht
> [PATCH 3/4] mac80211: add association capabilty and timing
> info into bss_conf
> [PATCH 4/4] iwlwifi: Eliminate association from beacon



>  Regards,
>         Chr.
>
>
>
>
>

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Johannes Berg]

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


> >  On Tue, 2008-04-01 at 21:45 +0200, Chr wrote:
> >  > This patch is necessary for the upcoming Accesspoint patch for p54.
> >
> >  Hm. I don't like increasing the tx control structure size but I guess
> >  you really need that :)

> Not sure why this cannot be bookeeped in the driver.
> Upon association AID is delivered to driver, so every packet that will
> be sent to this AP has this AID?

We're talking about AP mode, and afaict to do that in the driver you'd
have to have a hash table from sta MAC -> AID.

johannes

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

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Tomas Winkler]

On Thu, Apr 3, 2008 at 1:21 PM, Johannes Berg <johannes@sipsolutions.net> wrote:
>
>  > >  On Tue, 2008-04-01 at 21:45 +0200, Chr wrote:
>  > >  > This patch is necessary for the upcoming Accesspoint patch for p54.
>  > >
>  > >  Hm. I don't like increasing the tx control structure size but I guess
>  > >  you really need that :)
>
>
> > Not sure why this cannot be bookeeped in the driver.
>  > Upon association AID is delivered to driver, so every packet that will
>  > be sent to this AP has this AID?
>
>  We're talking about AP mode, and afaict to do that in the driver you'd
>  have to have a hash table from sta MAC -> AID.

I see, AP mode is different story and in second thought it think we
can use this to speed up TX path
also for iwliwfi, we waste significant time on searching for STA based
on MAC address.
So it's ACK from me. Thanks for opening my eyes :)

Another question is if there will be more info needed for station in the driver.
Currently in iwlwifi we have STA representation, this is HW
requirement but some data are kept twice in iwlwifi and mac.
The question is whether STA mac80211 representation cannot be more
accessible to the driver?  Not sure how this can be done
without over complicated station book keeping.


Thanks
Tomas.

Re: [PATCH] mac80211: add station aid into ieee80211_tx_control

[Johannes Berg]

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


> I see, AP mode is different story and in second thought it think we
> can use this to speed up TX path
> also for iwliwfi, we waste significant time on searching for STA based
> on MAC address.
> So it's ACK from me. Thanks for opening my eyes :)
> 
> Another question is if there will be more info needed for station in the driver.
> Currently in iwlwifi we have STA representation, this is HW
> requirement but some data are kept twice in iwlwifi and mac.
> The question is whether STA mac80211 representation cannot be more
> accessible to the driver?  Not sure how this can be done
> without over complicated station book keeping.

Yeah, that's a bit tough, I'm not sure how to do it.

Maybe we could have a struct ieee80211_sta_info (defined in mac80211.h)
embedded into struct sta_info and pass that along everywhere sort of
like we do with struct key/key_conf?

johannes

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