e1000e: fixup merge error

When merging into Jeff's tree:

	commit 5f66f208064f083aab5e55935d0575892e033b59
	Author: Arthur Jones <ajones@riverbed.com>
	Date:   Thu Mar 19 01:13:08 2009 +0000

	    e1000e: allow tx of pre-formatted vlan tagged packets

We lost one line, this fixes that missing
piece...

Signed-off-by: Arthur Jones <ajones@riverbed.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index d092eafde9bf042a1ea5346f6815625e9ff50eba..f388a01793254231c49c3f3ea1624fb65c758f2d 100644 (file)
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -3774,7 +3774,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
        else
                protocol = skb->protocol;
 
-       switch (skb->protocol) {
+       switch (protocol) {
        case cpu_to_be16(ETH_P_IP):
                if (ip_hdr(skb)->protocol == IPPROTO_TCP)
                        cmd_len |= E1000_TXD_CMD_TCP;