aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Brandeburg <jesse.brandeburg@intel.com>2016-04-01 06:56:05 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2016-04-06 21:15:17 -0400
commit84b079928a10559ebc6679e1e973a3ee5b20ba83 (patch)
treef2cfeb8e53559090fc8d1a84667416054844af2f
parentd1bd743b5b4d675e739b574284d1412ba996fe07 (diff)
i40e/i40evf: Drop unused tx_ring argument
Some of the tx_ring arguments can be deleted since they are not used. Change-ID: I99275b0f191d7f63ec2f05061919904940c36f31 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>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_txrx.c6
-rw-r--r--drivers/net/ethernet/intel/i40evf/i40e_txrx.c6
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_txrx.c b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
index 76a48e9c859b..f4e4d3d098dc 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_txrx.c
@@ -2252,15 +2252,13 @@ out:
2252 2252
2253/** 2253/**
2254 * i40e_tso - set up the tso context descriptor 2254 * i40e_tso - set up the tso context descriptor
2255 * @tx_ring: ptr to the ring to send
2256 * @skb: ptr to the skb we're sending 2255 * @skb: ptr to the skb we're sending
2257 * @hdr_len: ptr to the size of the packet header 2256 * @hdr_len: ptr to the size of the packet header
2258 * @cd_type_cmd_tso_mss: Quad Word 1 2257 * @cd_type_cmd_tso_mss: Quad Word 1
2259 * 2258 *
2260 * Returns 0 if no TSO can happen, 1 if tso is going, or error 2259 * Returns 0 if no TSO can happen, 1 if tso is going, or error
2261 **/ 2260 **/
2262static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 2261static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
2263 u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
2264{ 2262{
2265 u64 cd_cmd, cd_tso_len, cd_mss; 2263 u64 cd_cmd, cd_tso_len, cd_mss;
2266 union { 2264 union {
@@ -2932,7 +2930,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
2932 else if (protocol == htons(ETH_P_IPV6)) 2930 else if (protocol == htons(ETH_P_IPV6))
2933 tx_flags |= I40E_TX_FLAGS_IPV6; 2931 tx_flags |= I40E_TX_FLAGS_IPV6;
2934 2932
2935 tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss); 2933 tso = i40e_tso(skb, &hdr_len, &cd_type_cmd_tso_mss);
2936 2934
2937 if (tso < 0) 2935 if (tso < 0)
2938 goto out_drop; 2936 goto out_drop;
diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index d633dcf4a882..ec1f4479d72e 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -1519,15 +1519,13 @@ out:
1519 1519
1520/** 1520/**
1521 * i40e_tso - set up the tso context descriptor 1521 * i40e_tso - set up the tso context descriptor
1522 * @tx_ring: ptr to the ring to send
1523 * @skb: ptr to the skb we're sending 1522 * @skb: ptr to the skb we're sending
1524 * @hdr_len: ptr to the size of the packet header 1523 * @hdr_len: ptr to the size of the packet header
1525 * @cd_type_cmd_tso_mss: Quad Word 1 1524 * @cd_type_cmd_tso_mss: Quad Word 1
1526 * 1525 *
1527 * Returns 0 if no TSO can happen, 1 if tso is going, or error 1526 * Returns 0 if no TSO can happen, 1 if tso is going, or error
1528 **/ 1527 **/
1529static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb, 1528static int i40e_tso(struct sk_buff *skb, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
1530 u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
1531{ 1529{
1532 u64 cd_cmd, cd_tso_len, cd_mss; 1530 u64 cd_cmd, cd_tso_len, cd_mss;
1533 union { 1531 union {
@@ -2150,7 +2148,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
2150 else if (protocol == htons(ETH_P_IPV6)) 2148 else if (protocol == htons(ETH_P_IPV6))
2151 tx_flags |= I40E_TX_FLAGS_IPV6; 2149 tx_flags |= I40E_TX_FLAGS_IPV6;
2152 2150
2153 tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss); 2151 tso = i40e_tso(skb, &hdr_len, &cd_type_cmd_tso_mss);
2154 2152
2155 if (tso < 0) 2153 if (tso < 0)
2156 goto out_drop; 2154 goto out_drop;