aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
diff options
context:
space:
mode:
authorAndrew Gallatin <gallatin@myri.com>2012-11-30 12:31:26 +0000
committerDavid S. Miller <davem@davemloft.net>2012-12-01 11:36:37 -0500
commit30828d2b6070f1a4c71f26da75cda4bcdabfca02 (patch)
tree4dc3bc7921683e9be7de6278bb98d47f5ee68857 /drivers/net/ethernet/myricom/myri10ge/myri10ge.c
parentipv6: unify logic evaluating inet6_dev's accept_ra property (diff)
downloadlinux-dev-30828d2b6070f1a4c71f26da75cda4bcdabfca02.tar.xz
linux-dev-30828d2b6070f1a4c71f26da75cda4bcdabfca02.zip
myri10ge: fix incorrect use of ntohs()
1b4c44e6369dbbafd113f1e00b406f1eda5ab5b2 incorrectly used ntohs() rather than htons() in myri10ge_vlan_rx(). Thanks to Fengguang Wu, Yuanhan Liu's kernel-build tester for pointing out this bug. Signed-off-by: Andrew Gallatin <gallatin@myri.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/ethernet/myricom/myri10ge/myri10ge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
index 2fc984a03771..a40234ea2fbb 100644
--- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
+++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -1283,7 +1283,7 @@ myri10ge_vlan_rx(struct net_device *dev, void *addr, struct sk_buff *skb)
va += MXGEFW_PAD;
veh = (struct vlan_ethhdr *)va;
if ((dev->features & NETIF_F_HW_VLAN_RX) == NETIF_F_HW_VLAN_RX &&
- veh->h_vlan_proto == ntohs(ETH_P_8021Q)) {
+ veh->h_vlan_proto == htons(ETH_P_8021Q)) {
/* fixup csum if needed */
if (skb->ip_summed == CHECKSUM_COMPLETE) {
vsum = csum_partial(va + ETH_HLEN, VLAN_HLEN, 0);