Skip to content

Commit

Permalink
e1000e: fixup merge error
Browse files Browse the repository at this point in the history
When merging into Jeff's tree:

	commit 5f66f20
	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>
  • Loading branch information
Arthur Jones authored and David S. Miller committed Mar 20, 2009
1 parent 2b1c435 commit 3f51839
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/e1000e/netdev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 3f51839

Please sign in to comment.