Skip to content

Commit 9c883bd

Browse files
Shannon NelsonJeff Kirsher
authored andcommitted
i40e/i40evf: remove unused tunnel parameter
Code was moved into a separate function some time ago. Change-ID: Icabbe71ce05cf5d716d3e1152cdd9cd41d11bcb5 Signed-off-by: Shannon Nelson <shannon.nelson@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
1 parent de125aa commit 9c883bd

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,14 +2186,12 @@ static inline int i40e_tx_prepare_vlan_flags(struct sk_buff *skb,
21862186
* @tx_ring: ptr to the ring to send
21872187
* @skb: ptr to the skb we're sending
21882188
* @hdr_len: ptr to the size of the packet header
2189-
* @cd_type_cmd_tso_mss: ptr to u64 object
2190-
* @cd_tunneling: ptr to context descriptor bits
2189+
* @cd_type_cmd_tso_mss: Quad Word 1
21912190
*
21922191
* Returns 0 if no TSO can happen, 1 if tso is going, or error
21932192
**/
21942193
static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
2195-
u8 *hdr_len, u64 *cd_type_cmd_tso_mss,
2196-
u32 *cd_tunneling)
2194+
u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
21972195
{
21982196
u32 cd_cmd, cd_tso_len, cd_mss;
21992197
struct ipv6hdr *ipv6h;
@@ -2246,7 +2244,7 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
22462244
* @tx_ring: ptr to the ring to send
22472245
* @skb: ptr to the skb we're sending
22482246
* @tx_flags: the collected send information
2249-
* @cd_type_cmd_tso_mss: ptr to u64 object
2247+
* @cd_type_cmd_tso_mss: Quad Word 1
22502248
*
22512249
* Returns 0 if no Tx timestamp can happen and 1 if the timestamp will happen
22522250
**/
@@ -2825,8 +2823,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
28252823
else if (protocol == htons(ETH_P_IPV6))
28262824
tx_flags |= I40E_TX_FLAGS_IPV6;
28272825

2828-
tso = i40e_tso(tx_ring, skb, &hdr_len,
2829-
&cd_type_cmd_tso_mss, &cd_tunneling);
2826+
tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);
28302827

28312828
if (tso < 0)
28322829
goto out_drop;

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,13 +1436,12 @@ static inline int i40evf_tx_prepare_vlan_flags(struct sk_buff *skb,
14361436
* @tx_ring: ptr to the ring to send
14371437
* @skb: ptr to the skb we're sending
14381438
* @hdr_len: ptr to the size of the packet header
1439-
* @cd_tunneling: ptr to context descriptor bits
1439+
* @cd_type_cmd_tso_mss: Quad Word 1
14401440
*
14411441
* Returns 0 if no TSO can happen, 1 if tso is going, or error
14421442
**/
14431443
static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
1444-
u8 *hdr_len, u64 *cd_type_cmd_tso_mss,
1445-
u32 *cd_tunneling)
1444+
u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
14461445
{
14471446
u32 cd_cmd, cd_tso_len, cd_mss;
14481447
struct ipv6hdr *ipv6h;
@@ -1979,8 +1978,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
19791978
else if (protocol == htons(ETH_P_IPV6))
19801979
tx_flags |= I40E_TX_FLAGS_IPV6;
19811980

1982-
tso = i40e_tso(tx_ring, skb, &hdr_len,
1983-
&cd_type_cmd_tso_mss, &cd_tunneling);
1981+
tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);
19841982

19851983
if (tso < 0)
19861984
goto out_drop;

0 commit comments

Comments
 (0)