summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArthur Jones <ajones@riverbed.com>2009-03-20 15:56:35 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-20 15:56:35 -0700
commit3f518390ab1b65bc2e2bc01774eb2c5918c433ee (patch)
tree6fe79f253081f247d19a73d368ebed7272cbf598
parent2b1c4354de72ced917d2f3fe88117613f992234b (diff)
downloadlinux-3f518390ab1b65bc2e2bc01774eb2c5918c433ee.tar.gz
linux-3f518390ab1b65bc2e2bc01774eb2c5918c433ee.tar.bz2
linux-3f518390ab1b65bc2e2bc01774eb2c5918c433ee.zip
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>
-rw-r--r--drivers/net/e1000e/netdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index d092eafde9bf..f388a0179325 100644
--- 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;