Return-path: Received: from mail-oa0-f42.google.com ([209.85.219.42]:41069 "EHLO mail-oa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757491Ab3J1X2c (ORCPT ); Mon, 28 Oct 2013 19:28:32 -0400 From: Larry Finger To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Mark Cave-Ayland , netdev@vger.kernel.org, Larry Finger , Stable Subject: [PATCH NEXT] rtlwifi: Fix endian error in extracting packet type Date: Mon, 28 Oct 2013 18:28:23 -0500 Message-Id: <1383002903-8746-1-git-send-email-Larry.Finger@lwfinger.net> (sfid-20131029_002837_456718_6300B8DE) Sender: linux-wireless-owner@vger.kernel.org List-ID: From: Mark Cave-Ayland All of the rtlwifi drivers have an error in the routine that tests if the received data is "special". The 16-bit quantity is big-endian, but was being extracted in native CPU mode. One of the effects of this bug is to inhibit association under some conditions. A statement that would have made the code correct had been changed to a comment. Rather than just reinstating that code, the fix here passes sparse tests. Signed-off-by: Larry Finger Cc: Mark Cave-Ayland Cc: Stable [2.6.38+] --- drivers/net/wireless/rtlwifi/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 9a78e3d..1efde7f 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c @@ -1077,8 +1077,8 @@ u8 rtl_is_special_data(struct ieee80211_hw *hw, struct sk_buff *skb, u8 is_tx) ip = (struct iphdr *)((u8 *) skb->data + mac_hdr_len + SNAP_SIZE + PROTOC_TYPE_SIZE); - ether_type = *(u16 *) ((u8 *) skb->data + mac_hdr_len + SNAP_SIZE); - /* ether_type = ntohs(ether_type); */ + ether_type = be16_to_cpu(*(__be16 *)((u8 *)skb->data + mac_hdr_len + + SNAP_SIZE)); if (ETH_P_IP == ether_type) { if (IPPROTO_UDP == ip->protocol) { -- 1.8.4