diff options
| author | Javier Cardona <javier@cozybit.com> | 2010-12-16 17:23:34 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-20 14:49:47 -0500 |
| commit | 61ad5394590c5c5338ab4ec50553d809a9996d50 (patch) | |
| tree | e10a19ac4a14124ff223c29ed18a97b624e5244b /net/mac80211/tx.c | |
| parent | 3de135dba9341a3d10a7a5b9533ce11cb77d4f4d (diff) | |
| download | linux-3.10-61ad5394590c5c5338ab4ec50553d809a9996d50.tar.gz linux-3.10-61ad5394590c5c5338ab4ec50553d809a9996d50.tar.bz2 linux-3.10-61ad5394590c5c5338ab4ec50553d809a9996d50.zip | |
mac80211: Remove unused third address from mesh address extension header.
The Mesh Control header only includes 0, 1 or 2 addresses. If there is
one address, it should be interpreted as Address 4. If there are 2,
they are interpreted as Addresses 5 and 6 (Address 4 being the 4th
address in the 802.11 header).
The address extension used to hold up to 3 addresses instead of the current 2.
I'm not sure which draft version changed this, but it is very unlikely that it
will change again given the state of the approval process of this draft. See
section 7.1.3.6.3 in current draft (8.0).
Also, note that the extra address that I'm removing was not being used, so this
change has no effect on over-the-air frame formats. But I thought I better
remove it before someone does start using it.
Signed-off-by: Javier Cardona <javier@cozybit.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/tx.c')
| -rw-r--r-- | net/mac80211/tx.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f4b1b624ea9..807dcd06e26 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1811,7 +1811,7 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, hdrlen = ieee80211_fill_mesh_addresses(&hdr, &fc, skb->data, skb->data + ETH_ALEN); meshhdrlen = ieee80211_new_mesh_header(&mesh_hdr, - sdata, NULL, NULL, NULL); + sdata, NULL, NULL); } else { /* packet from other interface */ struct mesh_path *mppath; @@ -1844,13 +1844,11 @@ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, ieee80211_new_mesh_header(&mesh_hdr, sdata, skb->data + ETH_ALEN, - NULL, NULL); else meshhdrlen = ieee80211_new_mesh_header(&mesh_hdr, sdata, - NULL, skb->data, skb->data + ETH_ALEN); |