From patchwork Tue Dec 7 23:11:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bing Zhao X-Patchwork-Id: 384512 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB7NCAxu002680 for ; Tue, 7 Dec 2010 23:12:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753426Ab0LGXMJ (ORCPT ); Tue, 7 Dec 2010 18:12:09 -0500 Received: from dakia2.marvell.com ([65.219.4.35]:33576 "EHLO dakia2.marvell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752771Ab0LGXMI (ORCPT ); Tue, 7 Dec 2010 18:12:08 -0500 X-ASG-Debug-ID: 1291763515-082b003c0001-9xRsGE Received: from maili.marvell.com (maili.marvell.com [10.68.76.51]) by dakia2.marvell.com with ESMTP id C7aC4aIrcDkMy4d9; Tue, 07 Dec 2010 15:11:55 -0800 (PST) X-Barracuda-Envelope-From: bzhao@marvell.com Received: from localhost.localdomain (unknown [10.80.114.125]) by maili.marvell.com (Postfix) with ESMTP id A8C0D8A009; Tue, 7 Dec 2010 15:11:55 -0800 (PST) From: Bing Zhao To: linux-wireless@vger.kernel.org Cc: "John W. Linville" , Johannes Berg , Amitkumar Karwar , Kiran Divekar , Frank Huang , Bing Zhao X-ASG-Orig-Subj: [PATCH 1/2] mwifiex: replace struct eth_II_hdr with ethhdr Subject: [PATCH 1/2] mwifiex: replace struct eth_II_hdr with ethhdr Date: Tue, 7 Dec 2010 15:11:54 -0800 X-ASG-Orig-Subj: [PATCH 1/2] mwifiex: replace struct eth_II_hdr with ethhdr Message-Id: <1291763515-1203-1-git-send-email-bzhao@marvell.com> X-Mailer: git-send-email 1.7.0.2 X-Barracuda-Connect: maili.marvell.com[10.68.76.51] X-Barracuda-Start-Time: 1291763515 X-Barracuda-URL: http://10.68.76.222:80/cgi-mod/mark.cgi X-Barracuda-Spam-Score: -1002.00 X-Barracuda-Spam-Status: No, SCORE=-1002.00 using global scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=1000.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Dec 2010 23:12:11 +0000 (UTC) diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h index ed691ac..86e8a96 100644 --- a/drivers/net/wireless/mwifiex/fw.h +++ b/drivers/net/wireless/mwifiex/fw.h @@ -20,6 +20,9 @@ #ifndef _MWIFIEX_FW_H_ #define _MWIFIEX_FW_H_ +#include + + #define INTF_HEADER_LEN 4 struct eth_803_hdr { diff --git a/drivers/net/wireless/mwifiex/sta_rx.c b/drivers/net/wireless/mwifiex/sta_rx.c index 504c377..022ae4b 100644 --- a/drivers/net/wireless/mwifiex/sta_rx.c +++ b/drivers/net/wireless/mwifiex/sta_rx.c @@ -26,16 +26,6 @@ #include "11n_aggr.h" #include "11n_rxreorder.h" -/** Ethernet II header */ -struct eth_II_hdr { - /** Ethernet II header destination address */ - u8 dest_addr[MWIFIEX_MAC_ADDR_LENGTH]; - /** Ethernet II header source address */ - u8 src_addr[MWIFIEX_MAC_ADDR_LENGTH]; - /** Ethernet II header length */ - u16 ethertype; -}; - /* * This function processes the received packet and forwards it * to kernel/upper layer. @@ -58,7 +48,7 @@ mwifiex_process_rx_packet(struct mwifiex_adapter *adapter, struct rx_packet_hdr *rx_pkt_hdr; struct rxpd *local_rx_pd; int hdr_chop; - struct eth_II_hdr *eth_hdr; + struct ethhdr *eth_hdr; u8 rfc1042_eth_hdr[MWIFIEX_MAC_ADDR_LENGTH] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; @@ -114,7 +104,7 @@ mwifiex_process_rx_packet(struct mwifiex_adapter *adapter, * To create the Ethernet II, just move the src, dst address * right before the snap_type. */ - eth_hdr = (struct eth_II_hdr *) + eth_hdr = (struct ethhdr *) ((u8 *) &rx_pkt_hdr->eth803_hdr + sizeof(rx_pkt_hdr->eth803_hdr) + sizeof(rx_pkt_hdr->rfc1042_hdr) @@ -122,10 +112,10 @@ mwifiex_process_rx_packet(struct mwifiex_adapter *adapter, - sizeof(rx_pkt_hdr->eth803_hdr.src_addr) - sizeof(rx_pkt_hdr->rfc1042_hdr.snap_type)); - memcpy(eth_hdr->src_addr, rx_pkt_hdr->eth803_hdr.src_addr, - sizeof(eth_hdr->src_addr)); - memcpy(eth_hdr->dest_addr, rx_pkt_hdr->eth803_hdr.dest_addr, - sizeof(eth_hdr->dest_addr)); + memcpy(eth_hdr->h_source, rx_pkt_hdr->eth803_hdr.src_addr, + sizeof(eth_hdr->h_source)); + memcpy(eth_hdr->h_dest, rx_pkt_hdr->eth803_hdr.dest_addr, + sizeof(eth_hdr->h_dest)); /* Chop off the rxpd + the excess memory from the 802.2/llc/snap header that was removed. */