From 53a027f3dadfb95940ae9cf4f2ab7236cc32239d Mon Sep 17 00:00:00 2001
From: Hao Zheng <hzheng@nicira.com>
Date: Thu, 11 Nov 2010 13:47:58 +0000
Subject: [PATCH] --- yaml --- r: 222041 b: refs/heads/master c:
 d0d9d8ef5949551276f635cb04969184ba1a9553 h: refs/heads/master i:   222039:
 fd8abc94065a848a95c60f6e0a1b9859ea4b426f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/bnx2x/bnx2x_cmn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 381be723718b..79a36ea35b1b 100644
--- 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
index 459614d2d7bc..94d5f59d5a6f 100644
--- 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;