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

Commit c613d16f authored Dec 02, 2013 by Amitkumar Karwar Committed by John W. Linville Dec 09, 2013

mwifiex: fix an issue with Appletalk devices



SNAP/LLC header in the AARP packet is being stripped off while
preparing an EthernetII header.
Annex M, Table M.3 in 802.11 spec says that some header
(ex. AppleTalk AARP(2)) should pass through untouched.
This patch modifies the check to exclude/include EthernetII
header translation for special cases.

Signed-off-by: Amitkumar Karwar <akarwar@marvell.com>
Signed-off-by: Bing Zhao <bzhao@marvell.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 1bf947a7

drivers/net/wireless/mwifiex/sta_rx.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -94,8 +94,12 @@ int mwifiex_process_rx_packet(struct mwifiex_private *priv,
	rx_pkt_hdr = (void *)local_rx_pd +		rx_pkt_hdr = (void *)local_rx_pd +
	le16_to_cpu(local_rx_pd->rx_pkt_offset);		le16_to_cpu(local_rx_pd->rx_pkt_offset);

	if (!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,		if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,
	sizeof(rfc1042_header))) {		sizeof(bridge_tunnel_header))) \|\|
			(!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,
			sizeof(rfc1042_header)) &&
			ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_AARP &&
			ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_IPX)) {
	/*		/*
	* Replace the 803 header and rfc1042 header (llc/snap) with an		* Replace the 803 header and rfc1042 header (llc/snap) with an
	* EthernetII header, keep the src/dst and snap_type		* EthernetII header, keep the src/dst and snap_type

drivers/net/wireless/mwifiex/uap_txrx.c

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -111,8 +111,12 @@ static void mwifiex_uap_queue_bridged_pkt(struct mwifiex_private *priv,
	return;		return;
	}		}

	if (!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,		if ((!memcmp(&rx_pkt_hdr->rfc1042_hdr, bridge_tunnel_header,
	sizeof(rfc1042_header))) {		sizeof(bridge_tunnel_header))) \|\|
			(!memcmp(&rx_pkt_hdr->rfc1042_hdr, rfc1042_header,
			sizeof(rfc1042_header)) &&
			ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_AARP &&
			ntohs(rx_pkt_hdr->rfc1042_hdr.snap_type) != ETH_P_IPX)) {
	/* Replace the 803 header and rfc1042 header (llc/snap) with		/* Replace the 803 header and rfc1042 header (llc/snap) with
	* an Ethernet II header, keep the src/dst and snap_type		* an Ethernet II header, keep the src/dst and snap_type
	* (ethertype).		* (ethertype).