aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJavier Cardona <javier@cozybit.com>2010-12-16 20:23:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-20 14:49:47 -0500
commit61ad5394590c5c5338ab4ec50553d809a9996d50 (patch)
treee10a19ac4a14124ff223c29ed18a97b624e5244b /include
parent3de135dba9341a3d10a7a5b9533ce11cb77d4f4d (diff)
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 'include')
-rw-r--r--include/linux/ieee80211.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h
index cd681681d211..6042228954a7 100644
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
@@ -536,7 +536,6 @@ struct ieee80211s_hdr {
536 __le32 seqnum; 536 __le32 seqnum;
537 u8 eaddr1[6]; 537 u8 eaddr1[6];
538 u8 eaddr2[6]; 538 u8 eaddr2[6];
539 u8 eaddr3[6];
540} __attribute__ ((packed)); 539} __attribute__ ((packed));
541 540
542/* Mesh flags */ 541/* Mesh flags */