From c9b3ac83b2b68555e708c278bef934b6eadd46f4 Mon Sep 17 00:00:00 2001 From: Andrew Gallatin Date: Fri, 30 Nov 2012 12:31:26 +0000 Subject: [PATCH] --- yaml --- r: 341695 b: refs/heads/master c: 30828d2b6070f1a4c71f26da75cda4bcdabfca02 h: refs/heads/master i: 341693: 929fb5d1a928b259f96d3e690c4f07d7d1011f85 341691: b24e949c86cad7427fe3120f4b3bbaabfb10daed 341687: e9adf70ee5e1e0f85c5c2a6550ee1b0fe96ccab5 341679: 44a85b2b31d14fc072f9cc22e5db5261bb2101a0 341663: 7864055d1721481ca2813da2c6ee717bdd64b0ed 341631: 09ad6d3c3ae413478d968964ea8fed223493fb42 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 943514d58259..707f36f3b134 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aeaf6e9d2f49d793d3eb8c1af4095cf25e061b94 +refs/heads/master: 30828d2b6070f1a4c71f26da75cda4bcdabfca02 diff --git a/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 2fc984a03771..a40234ea2fbb 100644 --- a/trunk/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/trunk/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);