diff options
| author | Ihar Hrachyshka <ihar.hrachyshka@promwad.com> | 2008-01-25 14:15:00 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-31 19:26:48 -0800 |
| commit | 5a6e04345abf04f543373f45081d109d13d96822 (patch) | |
| tree | 0e2f8f6e4d4b224c25da4afa0d5cfd5eb0da05d0 | |
| parent | 9e7d1a445ed0d5c1d8863945d6c4c6f018a4aa83 (diff) | |
| download | linux-5a6e04345abf04f543373f45081d109d13d96822.tar.gz linux-5a6e04345abf04f543373f45081d109d13d96822.tar.xz | |
libertas: fix memory alignment problems on the blackfin
Fixing unaligned memory access on the blackfin architecture (maybe on the
ARM also).
Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka@promwad.com>
Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/wireless/libertas/assoc.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/libertas/dev.h | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index c622e9b63cd1..87e145ffe8f1 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c @@ -12,8 +12,10 @@ #include "cmd.h" -static const u8 bssid_any[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; +static const u8 bssid_any[ETH_ALEN] __attribute__ ((aligned (2))) = + { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; +static const u8 bssid_off[ETH_ALEN] __attribute__ ((aligned (2))) = + { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; static int assoc_helper_essid(struct lbs_private *priv, diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h index 58d7ef6b5ff5..5a69f2b60865 100644 --- a/drivers/net/wireless/libertas/dev.h +++ b/drivers/net/wireless/libertas/dev.h @@ -349,7 +349,7 @@ struct assoc_request { u8 channel; u8 band; u8 mode; - u8 bssid[ETH_ALEN]; + u8 bssid[ETH_ALEN] __attribute__ ((aligned (2))); /** WEP keys */ struct enc_key wep_keys[4]; |