Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5a6e04345abf04f543373f45081d109d13d96822
Commit:     5a6e04345abf04f543373f45081d109d13d96822
Parent:     9e7d1a445ed0d5c1d8863945d6c4c6f018a4aa83
Author:     Ihar Hrachyshka <[EMAIL PROTECTED]>
AuthorDate: Fri Jan 25 14:15:00 2008 +0100
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 19:26:48 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Holger Schurig <[EMAIL PROTECTED]>
    Acked-by: Dan Williams <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 drivers/net/wireless/libertas/assoc.c |    6 ++++--
 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 c622e9b..87e145f 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 58d7ef6..5a69f2b 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];
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to