i40e/i40evf: Move stack var deeper

Orabug: 23176970

A local variable could move down inside the context where it is used.

Change-ID: I9caba9e1eacf921037077f2665cbce83fd8e95d6
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit d1bd743b5b4d675e739b574284d1412ba996fe07)
Signed-off-by: Brian Maly <brian.maly@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 2ef327b78fc0ea0cabb6174c7eb62d60a13d2621..bfca23eb2c86f8064cf56761cac697a6716d11ba 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2406,7 +2406,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
                unsigned char *hdr;
        } l4;
        unsigned char *exthdr;
-       u32 offset, cmd = 0, tunnel = 0;
+       u32 offset, cmd = 0;
        __be16 frag_off;
        u8 l4_proto = 0;
 
@@ -2420,6 +2420,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
        offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
 
        if (skb->encapsulation) {
+               u32 tunnel = 0;
                /* define outer network header type */
                if (*tx_flags & I40E_TX_FLAGS_IPV4) {
                        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 47ceb5382193518274fc15989d864796c697457f..ed6945afd823bbbc191a2267933cca2086c07060 100644 (file)
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1631,7 +1631,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
                unsigned char *hdr;
        } l4;
        unsigned char *exthdr;
-       u32 offset, cmd = 0, tunnel = 0;
+       u32 offset, cmd = 0;
        __be16 frag_off;
        u8 l4_proto = 0;
 
@@ -1645,6 +1645,7 @@ static int i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,
        offset = ((ip.hdr - skb->data) / 2) << I40E_TX_DESC_LENGTH_MACLEN_SHIFT;
 
        if (skb->encapsulation) {
+               u32 tunnel = 0;
                /* define outer network header type */
                if (*tx_flags & I40E_TX_FLAGS_IPV4) {
                        tunnel |= (*tx_flags & I40E_TX_FLAGS_TSO) ?