---

yaml --- r: 341695 b: refs/heads/master c: 30828d2 h: refs/heads/master i: 341693: 929fb5d 341691: b24e949 341687: e9adf70 341679: 44a85b2 341663: 7864055 341631: 09ad6d3 v: v3
git-mirror · Dec 1, 2012 · c9b3ac8 · c9b3ac8
1 parent cb65a8f
commit c9b3ac8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);