Commit 3f518390 authored by Arthur Jones's avatar Arthur Jones Committed by David S. Miller

e1000e: fixup merge error

When merging into Jeff's tree:

	commit 5f66f208
	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: default avatarArthur Jones <ajones@riverbed.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2b1c4354
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment