From ba202cf3ac1a57eb4ae550e9aee75ca8ece103c0 Mon Sep 17 00:00:00 2001
From: Gurucharan Shetty <gshetty@riverbed.com>
Date: Tue, 15 Dec 2009 13:00:31 +0000
Subject: [PATCH] --- yaml --- r: 177164 b: refs/heads/master c:
 ca553980432898da5d4125573a9e2aee6ed5d355 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 3008a9ca00af..f8330ce2726a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 734e979f25a74e0d7da4ae0498ecac644db6377d
+refs/heads/master: ca553980432898da5d4125573a9e2aee6ed5d355
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index 529274824931..bd64387563f0 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -5006,7 +5006,18 @@ static bool ixgbe_tx_csum(struct ixgbe_adapter *adapter,
 		                    IXGBE_ADVTXD_DTYP_CTXT);
 
 		if (skb->ip_summed == CHECKSUM_PARTIAL) {
-			switch (skb->protocol) {
+			__be16 protocol;
+
+			if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
+				const struct vlan_ethhdr *vhdr =
+					(const struct vlan_ethhdr *)skb->data;
+
+				protocol = vhdr->h_vlan_encapsulated_proto;
+			} else {
+				protocol = skb->protocol;
+			}
+
+			switch (protocol) {
 			case cpu_to_be16(ETH_P_IP):
 				type_tucmd_mlhl |= IXGBE_ADVTXD_TUCMD_IPV4;
 				if (ip_hdr(skb)->protocol == IPPROTO_TCP)