diff options
author | David S. Miller <davem@davemloft.net> | 2008-05-29 01:49:04 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-05-29 01:49:04 -0700 |
commit | 8c3a01d0c259ec8b283c52dbeadda0122582a68b (patch) | |
tree | ebd17d756c14bf86a99185e88f73a7bba0544af9 /net/mac80211/util.c | |
parent | 4c8411f8c115def968820a4df6658ccfd55d7f1a (diff) | |
parent | c97c23e38625f59e3e9869664eeeb0cab1822948 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 131e9e6c8a3..4e97b266f90 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -34,11 +34,11 @@ void *mac80211_wiphy_privid = &mac80211_wiphy_privid; /* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */ /* Ethernet-II snap header (RFC1042 for most EtherTypes) */ -const unsigned char rfc1042_header[] = +const unsigned char rfc1042_header[] __aligned(2) = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; /* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */ -const unsigned char bridge_tunnel_header[] = +const unsigned char bridge_tunnel_header[] __aligned(2) = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; |