瀏覽代碼

mwifiex: declare snap_type as __be16 variable

Actually we are updating snap_type with h_proto (__be16 variable)
in ethernet frame header. Hence endianness conversion is not
required.

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>
Amitkumar Karwar 11 年之前
父節點
當前提交
a6efc5b7f8
共有 2 個文件被更改,包括 4 次插入4 次删除
  1. 3 3
      drivers/net/wireless/mwifiex/11n_aggr.c
  2. 1 1
      drivers/net/wireless/mwifiex/fw.h

+ 3 - 3
drivers/net/wireless/mwifiex/11n_aggr.c

@@ -69,9 +69,9 @@ mwifiex_11n_form_amsdu_pkt(struct sk_buff *skb_aggr,
 	memcpy(&tx_header->eth803_hdr, skb_src->data, dt_offset);
 	memcpy(&tx_header->eth803_hdr, skb_src->data, dt_offset);
 
 
 	/* Copy SNAP header */
 	/* Copy SNAP header */
-	snap.snap_type =
-		le16_to_cpu(*(__le16 *) ((u8 *)skb_src->data + dt_offset));
-	dt_offset += sizeof(u16);
+	snap.snap_type = ((struct ethhdr *)skb_src->data)->h_proto;
+
+	dt_offset += sizeof(__be16);
 
 
 	memcpy(&tx_header->rfc1042_hdr, &snap, sizeof(struct rfc_1042_hdr));
 	memcpy(&tx_header->rfc1042_hdr, &snap, sizeof(struct rfc_1042_hdr));
 
 

+ 1 - 1
drivers/net/wireless/mwifiex/fw.h

@@ -30,7 +30,7 @@ struct rfc_1042_hdr {
 	u8 llc_ssap;
 	u8 llc_ssap;
 	u8 llc_ctrl;
 	u8 llc_ctrl;
 	u8 snap_oui[3];
 	u8 snap_oui[3];
-	u16 snap_type;
+	__be16 snap_type;
 };
 };
 
 
 struct rx_packet_hdr {
 struct rx_packet_hdr {