e1000e: fixup merge error
When merging into Jeff's tree:
commit 5f66f20806
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>
This commit is contained in:
parent
2b1c4354de
commit
3f518390ab
|
@ -3774,7 +3774,7 @@ static bool e1000_tx_csum(struct e1000_adapter *adapter, struct sk_buff *skb)
|
||||||
else
|
else
|
||||||
protocol = skb->protocol;
|
protocol = skb->protocol;
|
||||||
|
|
||||||
switch (skb->protocol) {
|
switch (protocol) {
|
||||||
case cpu_to_be16(ETH_P_IP):
|
case cpu_to_be16(ETH_P_IP):
|
||||||
if (ip_hdr(skb)->protocol == IPPROTO_TCP)
|
if (ip_hdr(skb)->protocol == IPPROTO_TCP)
|
||||||
cmd_len |= E1000_TXD_CMD_TCP;
|
cmd_len |= E1000_TXD_CMD_TCP;
|
||||||
|
|
Loading…
Reference in New Issue