diff options
| author | Amitkumar Karwar <akarwar@marvell.com> | 2013-12-03 07:17:49 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-12-09 20:35:27 (GMT) |
| commit | a6efc5b7f8e737c8e7c97b3c671ae211c5ece3d8 (patch) | |
| tree | 19cda130c4c7ef0fdc6648d9f31861f2bcf3bffb /drivers | |
| parent | 4348d085b8ef9067e32ccc1a9e90e33c0e4b4e66 (diff) | |
| download | linux-a6efc5b7f8e737c8e7c97b3c671ae211c5ece3d8.tar.xz | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/wireless/mwifiex/11n_aggr.c | 6 | ||||
| -rw-r--r-- | drivers/net/wireless/mwifiex/fw.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/mwifiex/11n_aggr.c b/drivers/net/wireless/mwifiex/11n_aggr.c index 1214c58..63211707 100644 --- a/drivers/net/wireless/mwifiex/11n_aggr.c +++ b/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); /* 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)); diff --git a/drivers/net/wireless/mwifiex/fw.h b/drivers/net/wireless/mwifiex/fw.h index 6998413..8fcb500 100644 --- a/drivers/net/wireless/mwifiex/fw.h +++ b/drivers/net/wireless/mwifiex/fw.h @@ -30,7 +30,7 @@ struct rfc_1042_hdr { u8 llc_ssap; u8 llc_ctrl; u8 snap_oui[3]; - u16 snap_type; + __be16 snap_type; }; struct rx_packet_hdr { |