Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8ed9b5e1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-05-28

This series contains updates to ethtool, ixgbe, i40e and i40evf.

John adds helper routines for ethtool to pass VF to rx_flow_spec.  Since
the ring_cookie is 64 bits wide which is much larger than what could be
used for actual queue index values, provide helper routines to pack a VF
index into the cookie.  Then John provides a ixgbe patch to allow flow
director to use the entire queue space.

Neerav provides a i40e patch to collect XOFF Rx stats, where it was not
being collected before.

Anjali provides ATR support for tunneled packets, as well as stats to
count tunnel ATR hits.  Cleaned up PF struct members which are
unnecessary, since we can use the stat index macro directly.  Cleaned
up flow director ATR/SB messages to a higher debug level since they
are not useful unless silicon validation is happening.

Greg provides a patch to disable offline diagnostics if VFs are enabled
since ethtool offline diagnostic tests are not designed (out of scope)
to disable VF functions for testing and re-enable afterward.  Also cleans
up TODO comment that is no longer needed.

Vasu provides a fix an FCoE EOF case where i40e_fcoe_ctxt_eof() maybe
called before i40e_fcoe_eof_is_supported() is called.

Jesse adds skb->xmit_more support for i40evf.  Then provides a performance
enhancement for i40evf by inlining some functions which provides a 15%
gain in small packet performance.  Also cleans up the use of time_stamp
since it is no longer used to determine if there is a tx_hang and was
a part of a previous tx_hang design which is no longer used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1ea23a21 f029094e

drivers/net/ethernet/intel/i40e/i40e.h

+3 −2
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ struct i40e_lump_tracking { 
enum i40e_fd_stat_idx {

	I40E_FD_STAT_ATR,

	I40E_FD_STAT_SB,

	I40E_FD_STAT_ATR_TUNNEL,

	I40E_FD_STAT_PF_COUNT

};

#define I40E_FD_STAT_PF_IDX(pf_id) ((pf_id) * I40E_FD_STAT_PF_COUNT)
@@ -189,6 +190,8 @@ enum i40e_fd_stat_idx { 
			(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR)

#define I40E_FD_SB_STAT_IDX(pf_id)  \

			(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_SB)

#define I40E_FD_ATR_TUNNEL_STAT_IDX(pf_id) \

			(I40E_FD_STAT_PF_IDX(pf_id) + I40E_FD_STAT_ATR_TUNNEL)



struct i40e_fdir_filter {

	struct hlist_node fdir_node;
@@ -263,8 +266,6 @@ struct i40e_pf { 


	struct hlist_head fdir_filter_list;

	u16 fdir_pf_active_filters;

	u16 fd_sb_cnt_idx;

	u16 fd_atr_cnt_idx;

	unsigned long fd_flush_timestamp;

	u32 fd_flush_cnt;

	u32 fd_add_err;

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+29 −1
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ static struct i40e_stats i40e_gstrings_stats[] = { 
	I40E_PF_STAT("rx_hwtstamp_cleared", rx_hwtstamp_cleared),

	I40E_PF_STAT("fdir_flush_cnt", fd_flush_cnt),

	I40E_PF_STAT("fdir_atr_match", stats.fd_atr_match),

	I40E_PF_STAT("fdir_atr_tunnel_match", stats.fd_atr_tunnel_match),

	I40E_PF_STAT("fdir_sb_match", stats.fd_sb_match),



	/* LPI stats */
@@ -1548,6 +1549,17 @@ static int i40e_loopback_test(struct net_device *netdev, u64 *data) 
	return *data;

}



static inline bool i40e_active_vfs(struct i40e_pf *pf)

{

	struct i40e_vf *vfs = pf->vf;

	int i;



	for (i = 0; i < pf->num_alloc_vfs; i++)

		if (vfs[i].vf_states & I40E_VF_STAT_ACTIVE)

			return true;

	return false;

}



static void i40e_diag_test(struct net_device *netdev,

			   struct ethtool_test *eth_test, u64 *data)

{
@@ -1560,6 +1572,20 @@ static void i40e_diag_test(struct net_device *netdev, 
		netif_info(pf, drv, netdev, "offline testing starting\n");



		set_bit(__I40E_TESTING, &pf->state);



		if (i40e_active_vfs(pf)) {

			dev_warn(&pf->pdev->dev,

				 "Please take active VFS offline and restart the adapter before running NIC diagnostics\n");

			data[I40E_ETH_TEST_REG]		= 1;

			data[I40E_ETH_TEST_EEPROM]	= 1;

			data[I40E_ETH_TEST_INTR]	= 1;

			data[I40E_ETH_TEST_LOOPBACK]	= 1;

			data[I40E_ETH_TEST_LINK]	= 1;

			eth_test->flags |= ETH_TEST_FL_FAILED;

			clear_bit(__I40E_TESTING, &pf->state);

			goto skip_ol_tests;

		}



		/* If the device is online then take it offline */

		if (if_running)

			/* indicate we're in test mode */
@@ -1605,6 +1631,8 @@ static void i40e_diag_test(struct net_device *netdev, 
		data[I40E_ETH_TEST_LOOPBACK] = 0;

	}



skip_ol_tests:



	netif_info(pf, drv, netdev, "testing finished\n");

}
@@ -2265,7 +2293,7 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 
	input->pctype = 0;

	input->dest_vsi = vsi->id;

	input->fd_status = I40E_FILTER_PROGRAM_DESC_FD_STATUS_FD_ID;

	input->cnt_index  = pf->fd_sb_cnt_idx;

	input->cnt_index  = I40E_FD_SB_STAT_IDX(pf->hw.pf_id);

	input->flow_type = fsp->flow_type;

	input->ip4_proto = fsp->h_u.usr_ip4_spec.proto;

drivers/net/ethernet/intel/i40e/i40e_fcoe.c

+7 −4
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ static inline int i40e_fcoe_fc_eof(struct sk_buff *skb, u8 *eof) 
 *

 * The FC EOF is converted to the value understood by HW for descriptor

 * programming. Never call this w/o calling i40e_fcoe_eof_is_supported()

 * first.

 * first and that already checks for all supported valid eof values.

 **/

static inline u32 i40e_fcoe_ctxt_eof(u8 eof)

{
@@ -132,9 +132,12 @@ static inline u32 i40e_fcoe_ctxt_eof(u8 eof) 
	case FC_EOF_A:

		return I40E_TX_DESC_CMD_L4T_EOFT_EOF_A;

	default:

		/* FIXME: still returns 0 */

		pr_err("Unrecognized EOF %x\n", eof);

		return 0;

		/* Supported valid eof shall be already checked by

		 * calling i40e_fcoe_eof_is_supported() first,

		 * therefore this default case shall never hit.

		 */

		WARN_ON(1);

		return -EINVAL;

	}

}

drivers/net/ethernet/intel/i40e/i40e_main.c

+23 −16
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static const char i40e_driver_string[] = 


#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 3

#define DRV_VERSION_BUILD 2

#define DRV_VERSION_BUILD 4

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -772,9 +772,8 @@ static void i40e_update_prio_xoff_rx(struct i40e_pf *pf) 


	dcb_cfg = &hw->local_dcbx_config;



	/* See if DCB enabled with PFC TC */

	if (!(pf->flags & I40E_FLAG_DCB_ENABLED) ||

	    !(dcb_cfg->pfc.pfcenable)) {

	/* Collect Link XOFF stats when PFC is disabled */

	if (!dcb_cfg->pfc.pfcenable) {

		i40e_update_link_xoff_rx(pf);

		return;

	}
@@ -1097,12 +1096,18 @@ static void i40e_update_pf_stats(struct i40e_pf *pf) 
			   &osd->rx_jabber, &nsd->rx_jabber);



	/* FDIR stats */

	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_atr_cnt_idx),

	i40e_stat_update32(hw,

			   I40E_GLQF_PCNT(I40E_FD_ATR_STAT_IDX(pf->hw.pf_id)),

			   pf->stat_offsets_loaded,

			   &osd->fd_atr_match, &nsd->fd_atr_match);

	i40e_stat_update32(hw, I40E_GLQF_PCNT(pf->fd_sb_cnt_idx),

	i40e_stat_update32(hw,

			   I40E_GLQF_PCNT(I40E_FD_SB_STAT_IDX(pf->hw.pf_id)),

			   pf->stat_offsets_loaded,

			   &osd->fd_sb_match, &nsd->fd_sb_match);

	i40e_stat_update32(hw,

		      I40E_GLQF_PCNT(I40E_FD_ATR_TUNNEL_STAT_IDX(pf->hw.pf_id)),

		      pf->stat_offsets_loaded,

		      &osd->fd_atr_tunnel_match, &nsd->fd_atr_tunnel_match);



	val = rd32(hw, I40E_PRTPM_EEE_STAT);

	nsd->tx_lpi_status =
@@ -4739,6 +4744,7 @@ static int i40e_up_complete(struct i40e_vsi *vsi) 
		pf->fd_add_err = pf->fd_atr_cnt = 0;

		if (pf->fd_tcp_rule > 0) {

			pf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "Forcing ATR off, sideband rules for TCP/IPv4 exist\n");

			pf->fd_tcp_rule = 0;

		}
@@ -5428,6 +5434,7 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf) 
		if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&

		    (pf->auto_disable_flags & I40E_FLAG_FD_SB_ENABLED)) {

			pf->auto_disable_flags &= ~I40E_FLAG_FD_SB_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "FD Sideband/ntuple is being enabled since we have space in the table now\n");

		}

	}
@@ -5436,6 +5443,7 @@ void i40e_fdir_check_and_reenable(struct i40e_pf *pf) 
		if ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&

		    (pf->auto_disable_flags & I40E_FLAG_FD_ATR_ENABLED)) {

			pf->auto_disable_flags &= ~I40E_FLAG_FD_ATR_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "ATR is being enabled since we have space in the table now\n");

		}

	}
@@ -5469,6 +5477,7 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf) 


		if (!(time_after(jiffies, min_flush_time)) &&

		    (fd_room < I40E_FDIR_BUFFER_HEAD_ROOM_FOR_ATR)) {

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "ATR disabled, not enough FD filter space.\n");

			disable_atr = true;

		}
@@ -5496,6 +5505,7 @@ static void i40e_fdir_flush_and_replay(struct i40e_pf *pf) 
			if (!disable_atr)

				pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

			clear_bit(__I40E_FD_FLUSH_REQUESTED, &pf->state);

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "FD Filter table flushed and FD-SB replayed.\n");

		}

	}
@@ -7676,12 +7686,8 @@ static int i40e_sw_init(struct i40e_pf *pf) 
	    (pf->hw.func_caps.fd_filters_best_effort > 0)) {

		pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

		pf->atr_sample_rate = I40E_DEFAULT_ATR_SAMPLE_RATE;

		/* Setup a counter for fd_atr per PF */

		pf->fd_atr_cnt_idx = I40E_FD_ATR_STAT_IDX(pf->hw.pf_id);

		if (!(pf->flags & I40E_FLAG_MFP_ENABLED)) {

			pf->flags |= I40E_FLAG_FD_SB_ENABLED;

			/* Setup a counter for fd_sb per PF */

			pf->fd_sb_cnt_idx = I40E_FD_SB_STAT_IDX(pf->hw.pf_id);

		} else {

			dev_info(&pf->pdev->dev,

				 "Flow Director Sideband mode Disabled in MFP mode\n");
@@ -7771,6 +7777,7 @@ bool i40e_set_ntuple(struct i40e_pf *pf, netdev_features_t features) 
		pf->fd_add_err = pf->fd_atr_cnt = pf->fd_tcp_rule = 0;

		pf->fdir_pf_active_filters = 0;

		pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

		if (I40E_DEBUG_FD & pf->hw.debug_mask)

			dev_info(&pf->pdev->dev, "ATR re-enabled.\n");

		/* if ATR was auto disabled it can be re-enabled. */

		if ((pf->flags & I40E_FLAG_FD_ATR_ENABLED) &&

drivers/net/ethernet/intel/i40e/i40e_txrx.c

+76 −68
Original line number Diff line number Diff line
@@ -165,9 +165,6 @@ int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data, u8 *raw_packet, 
	tx_desc->cmd_type_offset_bsz =

		build_ctob(td_cmd, 0, I40E_FDIR_MAX_RAW_PACKET_SIZE, 0);



	/* set the timestamp */

	tx_buf->time_stamp = jiffies;



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.

	 */
@@ -283,6 +280,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
	if (add) {

		pf->fd_tcp_rule++;

		if (pf->flags & I40E_FLAG_FD_ATR_ENABLED) {

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "Forcing ATR off, sideband rules for TCP/IPv4 flow being applied\n");

			pf->flags &= ~I40E_FLAG_FD_ATR_ENABLED;

		}
@@ -291,6 +289,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
				  (pf->fd_tcp_rule - 1) : 0;

		if (pf->fd_tcp_rule == 0) {

			pf->flags |= I40E_FLAG_FD_ATR_ENABLED;

			if (I40E_DEBUG_FD & pf->hw.debug_mask)

				dev_info(&pf->pdev->dev, "ATR re-enabled due to no sideband TCP/IPv4 rules\n");

		}

	}
@@ -501,6 +500,7 @@ static void i40e_fd_handle_status(struct i40e_ring *rx_ring, 
			if ((pf->flags & I40E_FLAG_FD_SB_ENABLED) &&

			    !(pf->auto_disable_flags &

				     I40E_FLAG_FD_SB_ENABLED)) {

				if (I40E_DEBUG_FD & pf->hw.debug_mask)

					dev_warn(&pdev->dev, "FD filter space full, new ntuple rules will not be added\n");

				pf->auto_disable_flags |=

							I40E_FLAG_FD_SB_ENABLED;
@@ -807,10 +807,6 @@ static bool i40e_clean_tx_irq(struct i40e_ring *tx_ring, int budget) 
			 tx_ring->vsi->seid,

			 tx_ring->queue_index,

			 tx_ring->next_to_use, i);

		dev_info(tx_ring->dev, "tx_bi[next_to_clean]\n"

			 "  time_stamp           <%lx>\n"

			 "  jiffies              <%lx>\n",

			 tx_ring->tx_bi[i].time_stamp, jiffies);



		netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
@@ -1653,9 +1649,6 @@ static int i40e_clean_rx_irq_ps(struct i40e_ring *rx_ring, int budget) 
		/* ERR_MASK will only have valid bits if EOP set */

		if (unlikely(rx_error & (1 << I40E_RX_DESC_ERROR_RXE_SHIFT))) {

			dev_kfree_skb_any(skb);

			/* TODO: shouldn't we increment a counter indicating the

			 * drop?

			 */

			continue;

		}
@@ -1923,11 +1916,11 @@ int i40e_napi_poll(struct napi_struct *napi, int budget) 
 * i40e_atr - Add a Flow Director ATR filter

 * @tx_ring:  ring to add programming descriptor to

 * @skb:      send buffer

 * @flags:    send flags

 * @tx_flags: send tx flags

 * @protocol: wire protocol

 **/

static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb,

		     u32 flags, __be16 protocol)

		     u32 tx_flags, __be16 protocol)

{

	struct i40e_filter_program_desc *fdir_desc;

	struct i40e_pf *pf = tx_ring->vsi->back;
@@ -1952,25 +1945,38 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
	if (!tx_ring->atr_sample_rate)

		return;



	if (!(tx_flags & (I40E_TX_FLAGS_IPV4 | I40E_TX_FLAGS_IPV6)))

		return;



	if (!(tx_flags & I40E_TX_FLAGS_VXLAN_TUNNEL)) {

		/* snag network header to get L4 type and address */

		hdr.network = skb_network_header(skb);



	/* Currently only IPv4/IPv6 with TCP is supported */

	if (protocol == htons(ETH_P_IP)) {

		if (hdr.ipv4->protocol != IPPROTO_TCP)

			return;



		/* access ihl as a u8 to avoid unaligned access on ia64 */

		/* Currently only IPv4/IPv6 with TCP is supported

		 * access ihl as u8 to avoid unaligned access on ia64

		 */

		if (tx_flags & I40E_TX_FLAGS_IPV4)

			hlen = (hdr.network[0] & 0x0F) << 2;

	} else if (protocol == htons(ETH_P_IPV6)) {

		if (hdr.ipv6->nexthdr != IPPROTO_TCP)

			return;



		else if (protocol == htons(ETH_P_IPV6))

			hlen = sizeof(struct ipv6hdr);

	} else {

		else

			return;

	} else {

		hdr.network = skb_inner_network_header(skb);

		hlen = skb_inner_network_header_len(skb);

	}



	/* Currently only IPv4/IPv6 with TCP is supported

	 * Note: tx_flags gets modified to reflect inner protocols in

	 * tx_enable_csum function if encap is enabled.

	 */

	if ((tx_flags & I40E_TX_FLAGS_IPV4) &&

	    (hdr.ipv4->protocol != IPPROTO_TCP))

		return;

	else if ((tx_flags & I40E_TX_FLAGS_IPV6) &&

		 (hdr.ipv6->nexthdr != IPPROTO_TCP))

		return;



	th = (struct tcphdr *)(hdr.network + hlen);



	/* Due to lack of space, no more new filters can be programmed */
@@ -2020,8 +2026,15 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
		     I40E_TXD_FLTR_QW1_FD_STATUS_SHIFT;



	dtype_cmd |= I40E_TXD_FLTR_QW1_CNT_ENA_MASK;

	if (!(tx_flags & I40E_TX_FLAGS_VXLAN_TUNNEL))

		dtype_cmd |=

			((u32)I40E_FD_ATR_STAT_IDX(pf->hw.pf_id) <<

			I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			I40E_TXD_FLTR_QW1_CNTINDEX_MASK;

	else

		dtype_cmd |=

		((u32)pf->fd_atr_cnt_idx << I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			((u32)I40E_FD_ATR_TUNNEL_STAT_IDX(pf->hw.pf_id) <<

			I40E_TXD_FLTR_QW1_CNTINDEX_SHIFT) &

			I40E_TXD_FLTR_QW1_CNTINDEX_MASK;



	fdir_desc->qindex_flex_ptype_vsi = cpu_to_le32(flex_ptype);
@@ -2043,11 +2056,11 @@ static void i40e_atr(struct i40e_ring *tx_ring, struct sk_buff *skb, 
 * otherwise  returns 0 to indicate the flags has been set properly.

 **/

#ifdef I40E_FCOE

int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

				      struct i40e_ring *tx_ring,

				      u32 *flags)

#else

static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,

					     struct i40e_ring *tx_ring,

					     u32 *flags)

#endif
@@ -2117,16 +2130,14 @@ static int i40e_tx_prepare_vlan_flags(struct sk_buff *skb, 
 * i40e_tso - set up the tso context descriptor

 * @tx_ring:  ptr to the ring to send

 * @skb:      ptr to the skb we're sending

 * @tx_flags: the collected send information

 * @protocol: the send protocol

 * @hdr_len:  ptr to the size of the packet header

 * @cd_tunneling: ptr to context descriptor bits

 *

 * Returns 0 if no TSO can happen, 1 if tso is going, or error

 **/

static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,

		    u32 tx_flags, __be16 protocol, u8 *hdr_len,

		    u64 *cd_type_cmd_tso_mss, u32 *cd_tunneling)

		    u8 *hdr_len, u64 *cd_type_cmd_tso_mss,

		    u32 *cd_tunneling)

{

	u32 cd_cmd, cd_tso_len, cd_mss;

	struct ipv6hdr *ipv6h;
@@ -2218,12 +2229,12 @@ static int i40e_tsyn(struct i40e_ring *tx_ring, struct sk_buff *skb, 
/**

 * i40e_tx_enable_csum - Enable Tx checksum offloads

 * @skb: send buffer

 * @tx_flags: Tx flags currently set

 * @tx_flags: pointer to Tx flags currently set

 * @td_cmd: Tx descriptor command bits to set

 * @td_offset: Tx descriptor header offsets to set

 * @cd_tunneling: ptr to context desc bits

 **/

static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags,

static void i40e_tx_enable_csum(struct sk_buff *skb, u32 *tx_flags,

				u32 *td_cmd, u32 *td_offset,

				struct i40e_ring *tx_ring,

				u32 *cd_tunneling)
@@ -2239,6 +2250,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
		switch (ip_hdr(skb)->protocol) {

		case IPPROTO_UDP:

			l4_tunnel = I40E_TXD_CTX_UDP_TUNNELING;

			*tx_flags |= I40E_TX_FLAGS_VXLAN_TUNNEL;

			break;

		default:

			return;
@@ -2248,18 +2260,17 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
		this_ipv6_hdr = inner_ipv6_hdr(skb);

		this_tcp_hdrlen = inner_tcp_hdrlen(skb);



		if (tx_flags & I40E_TX_FLAGS_IPV4) {



			if (tx_flags & I40E_TX_FLAGS_TSO) {

		if (*tx_flags & I40E_TX_FLAGS_IPV4) {

			if (*tx_flags & I40E_TX_FLAGS_TSO) {

				*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV4;

				ip_hdr(skb)->check = 0;

			} else {

				*cd_tunneling |=

					 I40E_TX_CTX_EXT_IP_IPV4_NO_CSUM;

			}

		} else if (tx_flags & I40E_TX_FLAGS_IPV6) {

		} else if (*tx_flags & I40E_TX_FLAGS_IPV6) {

			*cd_tunneling |= I40E_TX_CTX_EXT_IP_IPV6;

			if (tx_flags & I40E_TX_FLAGS_TSO)

			if (*tx_flags & I40E_TX_FLAGS_TSO)

				ip_hdr(skb)->check = 0;

		}
@@ -2271,8 +2282,8 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
					skb_transport_offset(skb)) >> 1) <<

				   I40E_TXD_CTX_QW0_NATLEN_SHIFT;

		if (this_ip_hdr->version == 6) {

			tx_flags &= ~I40E_TX_FLAGS_IPV4;

			tx_flags |= I40E_TX_FLAGS_IPV6;

			*tx_flags &= ~I40E_TX_FLAGS_IPV4;

			*tx_flags |= I40E_TX_FLAGS_IPV6;

		}

	} else {

		network_hdr_len = skb_network_header_len(skb);
@@ -2282,12 +2293,12 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
	}



	/* Enable IP checksum offloads */

	if (tx_flags & I40E_TX_FLAGS_IPV4) {

	if (*tx_flags & I40E_TX_FLAGS_IPV4) {

		l4_hdr = this_ip_hdr->protocol;

		/* the stack computes the IP header already, the only time we

		 * need the hardware to recompute it is in the case of TSO.

		 */

		if (tx_flags & I40E_TX_FLAGS_TSO) {

		if (*tx_flags & I40E_TX_FLAGS_TSO) {

			*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV4_CSUM;

			this_ip_hdr->check = 0;

		} else {
@@ -2296,7 +2307,7 @@ static void i40e_tx_enable_csum(struct sk_buff *skb, u32 tx_flags, 
		/* Now set the td_offset for IP header length */

		*td_offset = (network_hdr_len >> 2) <<

			      I40E_TX_DESC_LENGTH_IPLEN_SHIFT;

	} else if (tx_flags & I40E_TX_FLAGS_IPV6) {

	} else if (*tx_flags & I40E_TX_FLAGS_IPV6) {

		l4_hdr = this_ipv6_hdr->nexthdr;

		*td_cmd |= I40E_TX_DESC_CMD_IIPT_IPV6;

		/* Now set the td_offset for IP header length */
@@ -2394,9 +2405,9 @@ static inline int __i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size) 
 * Returns 0 if stop is not needed

 **/

#ifdef I40E_FCOE

int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

#else

static int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

static inline int i40e_maybe_stop_tx(struct i40e_ring *tx_ring, int size)

#endif

{

	if (likely(I40E_DESC_UNUSED(tx_ring) >= size))
@@ -2476,11 +2487,11 @@ static bool i40e_chk_linearize(struct sk_buff *skb, u32 tx_flags, 
 * @td_offset: offset for checksum or crc

 **/

#ifdef I40E_FCOE

void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

			struct i40e_tx_buffer *first, u32 tx_flags,

			const u8 hdr_len, u32 td_cmd, u32 td_offset)

#else

static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

static inline void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb,

			       struct i40e_tx_buffer *first, u32 tx_flags,

			       const u8 hdr_len, u32 td_cmd, u32 td_offset)

#endif
@@ -2588,9 +2599,6 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
						 tx_ring->queue_index),

			     first->bytecount);



	/* set the timestamp */

	first->time_stamp = jiffies;



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.  (Only

	 * applicable for weak-ordered memory model archs,
@@ -2643,10 +2651,10 @@ static void i40e_tx_map(struct i40e_ring *tx_ring, struct sk_buff *skb, 
 * one descriptor.

 **/

#ifdef I40E_FCOE

int i40e_xmit_descriptor_count(struct sk_buff *skb,

inline int i40e_xmit_descriptor_count(struct sk_buff *skb,

				      struct i40e_ring *tx_ring)

#else

static int i40e_xmit_descriptor_count(struct sk_buff *skb,

static inline int i40e_xmit_descriptor_count(struct sk_buff *skb,

					     struct i40e_ring *tx_ring)

#endif

{
@@ -2709,7 +2717,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	else if (protocol == htons(ETH_P_IPV6))

		tx_flags |= I40E_TX_FLAGS_IPV6;



	tso = i40e_tso(tx_ring, skb, tx_flags, protocol, &hdr_len,

	tso = i40e_tso(tx_ring, skb, &hdr_len,

		       &cd_type_cmd_tso_mss, &cd_tunneling);



	if (tso < 0)
@@ -2735,7 +2743,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb, 
	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		tx_flags |= I40E_TX_FLAGS_CSUM;



		i40e_tx_enable_csum(skb, tx_flags, &td_cmd, &td_offset,

		i40e_tx_enable_csum(skb, &tx_flags, &td_cmd, &td_offset,

				    tx_ring, &cd_tunneling);

	}