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

Commit c97c23e3 authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

mac80211: fix alignment issue with compare_ether_addr() 



This addresses an alignment issue with compare_ether_addr().
The addresses passed to compare_ether_addr should be two bytes aligned.
It may function properly in x86 platform. However may not work properly
on IA-64 or ARM processor.

This also fixes a typo in mlme.c where the sk_buff struct name is incorect.
Though sizeof() works for any incorrect structure pointer name as its just
a pointer length that we want, lets just fix it.

Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarLuis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 70d251b2

net/mac80211/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -1325,7 +1325,7 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, 


	/* prepare reordering buffer */

	tid_agg_rx->reorder_buf =

		kmalloc(buf_size * sizeof(struct sk_buf *), GFP_ATOMIC);

		kmalloc(buf_size * sizeof(struct sk_buff *), GFP_ATOMIC);

	if (!tid_agg_rx->reorder_buf) {

		if (net_ratelimit())

			printk(KERN_ERR "can not allocate reordering buffer "
@@ -1334,7 +1334,7 @@ static void ieee80211_sta_process_addba_request(struct net_device *dev, 
		goto end;

	}

	memset(tid_agg_rx->reorder_buf, 0,

		buf_size * sizeof(struct sk_buf *));

		buf_size * sizeof(struct sk_buff *));



	if (local->ops->ampdu_action)

		ret = local->ops->ampdu_action(hw, IEEE80211_AMPDU_RX_START,

net/mac80211/rx.c

+2 −2
Original line number Diff line number Diff line
@@ -1091,7 +1091,7 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) 
	u16 fc, hdrlen, ethertype;

	u8 *payload;

	u8 dst[ETH_ALEN];

	u8 src[ETH_ALEN];

	u8 src[ETH_ALEN] __aligned(2);

	struct sk_buff *skb = rx->skb;

	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

	DECLARE_MAC_BUF(mac);
@@ -1234,7 +1234,7 @@ ieee80211_data_to_8023(struct ieee80211_rx_data *rx) 
 */

static bool ieee80211_frame_allowed(struct ieee80211_rx_data *rx)

{

	static const u8 pae_group_addr[ETH_ALEN]

	static const u8 pae_group_addr[ETH_ALEN] __aligned(2)

		= { 0x01, 0x80, 0xC2, 0x00, 0x00, 0x03 };

	struct ethhdr *ehdr = (struct ethhdr *) rx->skb->data;

net/mac80211/util.c

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