From: Javier Cardona Date: Fri, 17 Dec 2010 01:23:34 +0000 (-0800) Subject: mac80211: Remove unused third address from mesh address extension header. X-Git-Tag: 1.9.3~26 X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=commitdiff_plain;h=1d155c5cc961835941f119e5b8baace1d54b09de;hp=e0778da7bcbe9128e57d683764eaaaa060618890 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 Signed-off-by: Christian Lamparter --- diff --git a/include/linux/ieee80211.h b/include/linux/ieee80211.h index 0f3bbee..112e859 100644 --- a/include/linux/ieee80211.h +++ b/include/linux/ieee80211.h @@ -533,7 +533,6 @@ struct ieee80211s_hdr { __le32 seqnum; u8 eaddr1[6]; u8 eaddr2[6]; - u8 eaddr3[6]; } __attribute__ ((packed)); /* Mesh flags */