public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

i40e/i40evf: remove unused tunnel parameter

Browse source 
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>
This commit is contained in:
Shannon Nelson 2015-10-21 19:47:02 -04:00 • committed by Jeff Kirsher
parent de125aaecf
commit 9c883bd3eb
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/net/ethernet/intel/i40e/i40e_txrx.c
View file

@ -2186,14 +2186,12 @@ out:
* @tx_ring: ptr to the ring to send * @tx_ring: ptr to the ring to send
* @skb: ptr to the skb we're sending * @skb: ptr to the skb we're sending
* @hdr_len: ptr to the size of the packet header * @hdr_len: ptr to the size of the packet header
* @cd_type_cmd_tso_mss: ptr to u64 object * @cd_type_cmd_tso_mss: Quad Word 1
* @cd_tunneling: ptr to context descriptor bits
* *
* Returns 0 if no TSO can happen, 1 if tso is going, or error * 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, static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
u8 *hdr_len, u64 *cd_type_cmd_tso_mss, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
u32 *cd_tunneling)
{ {
u32 cd_cmd, cd_tso_len, cd_mss; u32 cd_cmd, cd_tso_len, cd_mss;
struct ipv6hdr *ipv6h; struct ipv6hdr *ipv6h;
@ -2246,7 +2244,7 @@ static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
* @tx_ring: ptr to the ring to send * @tx_ring: ptr to the ring to send
* @skb: ptr to the skb we're sending * @skb: ptr to the skb we're sending
* @tx_flags: the collected send information * @tx_flags: the collected send information
* @cd_type_cmd_tso_mss: ptr to u64 object * @cd_type_cmd_tso_mss: Quad Word 1
* *
* Returns 0 if no Tx timestamp can happen and 1 if the timestamp will happen * Returns 0 if no Tx timestamp can happen and 1 if the timestamp will happen
**/ **/
@ -2825,8 +2823,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
else if (protocol == htons(ETH_P_IPV6)) else if (protocol == htons(ETH_P_IPV6))
tx_flags |= I40E_TX_FLAGS_IPV6; tx_flags |= I40E_TX_FLAGS_IPV6;
tso = i40e_tso(tx_ring, skb, &hdr_len, tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);
&cd_type_cmd_tso_mss, &cd_tunneling);
if (tso < 0) if (tso < 0)
goto out_drop; goto out_drop;

8
drivers/net/ethernet/intel/i40evf/i40e_txrx.c
View file

@ -1436,13 +1436,12 @@ out:
* @tx_ring: ptr to the ring to send * @tx_ring: ptr to the ring to send
* @skb: ptr to the skb we're sending * @skb: ptr to the skb we're sending
* @hdr_len: ptr to the size of the packet header * @hdr_len: ptr to the size of the packet header
* @cd_tunneling: ptr to context descriptor bits * @cd_type_cmd_tso_mss: Quad Word 1
* *
* Returns 0 if no TSO can happen, 1 if tso is going, or error * 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, static int i40e_tso(struct i40e_ring *tx_ring, struct sk_buff *skb,
u8 *hdr_len, u64 *cd_type_cmd_tso_mss, u8 *hdr_len, u64 *cd_type_cmd_tso_mss)
u32 *cd_tunneling)
{ {
u32 cd_cmd, cd_tso_len, cd_mss; u32 cd_cmd, cd_tso_len, cd_mss;
struct ipv6hdr *ipv6h; struct ipv6hdr *ipv6h;
@ -1979,8 +1978,7 @@ static netdev_tx_t i40e_xmit_frame_ring(struct sk_buff *skb,
else if (protocol == htons(ETH_P_IPV6)) else if (protocol == htons(ETH_P_IPV6))
tx_flags |= I40E_TX_FLAGS_IPV6; tx_flags |= I40E_TX_FLAGS_IPV6;
tso = i40e_tso(tx_ring, skb, &hdr_len, tso = i40e_tso(tx_ring, skb, &hdr_len, &cd_type_cmd_tso_mss);
&cd_type_cmd_tso_mss, &cd_tunneling);
if (tso < 0) if (tso < 0)
goto out_drop; goto out_drop;