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

Commit 2049e1f6 authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Kirsher
Browse files

ixgbe: remove open-coded skb_cow_head 



Signed-off-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 58cf663f

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+6 −7
Original line number Diff line number Diff line
@@ -6510,6 +6510,7 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring, 
	struct sk_buff *skb = first->skb;

	u32 vlan_macip_lens, type_tucmd;

	u32 mss_l4len_idx, l4len;

	int err;



	if (skb->ip_summed != CHECKSUM_PARTIAL)

		return 0;
@@ -6517,11 +6518,9 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring, 
	if (!skb_is_gso(skb))

		return 0;



	if (skb_header_cloned(skb)) {

		int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);

		if (err)

	err = skb_cow_head(skb, 0);

	if (err < 0)

		return err;

	}



	/* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */

	type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP;
@@ -7078,8 +7077,8 @@ netdev_tx_t ixgbe_xmit_frame_ring(struct sk_buff *skb, 
					IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT;

		if (tx_flags & IXGBE_TX_FLAGS_SW_VLAN) {

			struct vlan_ethhdr *vhdr;

			if (skb_header_cloned(skb) &&

			    pskb_expand_head(skb, 0, 0, GFP_ATOMIC))



			if (skb_cow_head(skb, 0))

				goto out_drop;

			vhdr = (struct vlan_ethhdr *)skb->data;

			vhdr->h_vlan_TCI = htons(tx_flags >>