Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a6e0434 authored by Ihar Hrachyshka's avatar Ihar Hrachyshka Committed by David S. Miller
Browse files

libertas: fix memory alignment problems on the blackfin 



Fixing unaligned memory access on the blackfin architecture (maybe on the
ARM also).

Signed-off-by: default avatarIhar Hrachyshka <ihar.hrachyshka@promwad.com>
Signed-off-by: default avatarHolger Schurig <hs4233@mail.mn-solutions.de>
Acked-by: default avatarDan Williams <dcbw@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9e7d1a44

drivers/net/wireless/libertas/assoc.c

+4 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/libertas/dev.h

+1 −1
Original line number Diff line number Diff line
@@ -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];