diff options
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c index 5d5fa5359a1d..76a48e9c859b 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c | |||
@@ -2408,7 +2408,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags, | |||
2408 | unsigned char *hdr; | 2408 | unsigned char *hdr; |
2409 | } l4; | 2409 | } l4; |
2410 | unsigned char *exthdr; | 2410 | unsigned char *exthdr; |
2411 | u32 offset, cmd = 0, tunnel = 0; | 2411 | u32 offset, cmd = 0; |
2412 | __be16 frag_off; | 2412 | __be16 frag_off; |
2413 | u8 l4_proto = 0; | 2413 | u8 l4_proto = 0; |
2414 | 2414 | ||
@@ -2422,6 +2422,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags, | |||
2422 | offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; | 2422 | offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; |
2423 | 2423 | ||
2424 | if (skb->encapsulation) { | 2424 | if (skb->encapsulation) { |
2425 | u32 tunnel = 0; | ||
2425 | /* define outer network header type */ | 2426 | /* define outer network header type */ |
2426 | if (*tx_flags & I40E_TX_FLAGS_IPV4) { | 2427 | if (*tx_flags & I40E_TX_FLAGS_IPV4) { |
2427 | tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ? | 2428 | tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ? |
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c index 04aabc52ba0d..d633dcf4a882 100644 --- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c +++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c | |||
@@ -1633,7 +1633,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags, | |||
1633 | unsigned char *hdr; | 1633 | unsigned char *hdr; |
1634 | } l4; | 1634 | } l4; |
1635 | unsigned char *exthdr; | 1635 | unsigned char *exthdr; |
1636 | u32 offset, cmd = 0, tunnel = 0; | 1636 | u32 offset, cmd = 0; |
1637 | __be16 frag_off; | 1637 | __be16 frag_off; |
1638 | u8 l4_proto = 0; | 1638 | u8 l4_proto = 0; |
1639 | 1639 | ||
@@ -1647,6 +1647,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags, | |||
1647 | offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; | 1647 | offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT; |
1648 | 1648 | ||
1649 | if (skb->encapsulation) { | 1649 | if (skb->encapsulation) { |
1650 | u32 tunnel = 0; | ||
1650 | /* define outer network header type */ | 1651 | /* define outer network header type */ |
1651 | if (*tx_flags & I40E_TX_FLAGS_IPV4) { | 1652 | if (*tx_flags & I40E_TX_FLAGS_IPV4) { |
1652 | tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ? | 1653 | tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ? |