---

yaml --- r: 222041 b: refs/heads/master c: d0d9d8e h: refs/heads/master i: 222039: fd8abc9 v: v3
git-mirror · Nov 12, 2010 · 53a027f · 53a027f
1 parent 81d3e8c
commit 53a027f
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: 0a85df004667c99efc31fab07386823eefce3be5
+refs/heads/master: d0d9d8ef5949551276f635cb04969184ba1a9553
diff --git a/trunk/drivers/net/bnx2x/bnx2x_cmn.c b/trunk/drivers/net/bnx2x/bnx2x_cmn.c
@@ -1680,7 +1680,7 @@ static inline u32 bnx2x_xmit_type(struct bnx2x *bp, struct sk_buff *skb)
 		rc = XMIT_PLAIN;
 
 	else {
-		if (skb->protocol == htons(ETH_P_IPV6)) {
+		if (vlan_get_protocol(skb) == htons(ETH_P_IPV6)) {
 			rc = XMIT_CSUM_V6;
 			if (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP)
 				rc |= XMIT_CSUM_TCP;