|
@@ -6510,6 +6510,7 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
|
|
struct sk_buff *skb = first->skb;
|
|
struct sk_buff *skb = first->skb;
|
|
u32 vlan_macip_lens, type_tucmd;
|
|
u32 vlan_macip_lens, type_tucmd;
|
|
u32 mss_l4len_idx, l4len;
|
|
u32 mss_l4len_idx, l4len;
|
|
|
|
+ int err;
|
|
|
|
|
|
if (skb->ip_summed != CHECKSUM_PARTIAL)
|
|
if (skb->ip_summed != CHECKSUM_PARTIAL)
|
|
return 0;
|
|
return 0;
|
|
@@ -6517,11 +6518,9 @@ static int ixgbe_tso(struct ixgbe_ring *tx_ring,
|
|
if (!skb_is_gso(skb))
|
|
if (!skb_is_gso(skb))
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- if (skb_header_cloned(skb)) {
|
|
|
|
- int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
|
|
|
|
- if (err)
|
|
|
|
- return err;
|
|
|
|
- }
|
|
|
|
|
|
+ err = skb_cow_head(skb, 0);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ return err;
|
|
|
|
|
|
/* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
|
|
/* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */
|
|
type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP;
|
|
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;
|
|
IXGBE_TX_FLAGS_VLAN_PRIO_SHIFT;
|
|
if (tx_flags & IXGBE_TX_FLAGS_SW_VLAN) {
|
|
if (tx_flags & IXGBE_TX_FLAGS_SW_VLAN) {
|
|
struct vlan_ethhdr *vhdr;
|
|
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;
|
|
goto out_drop;
|
|
vhdr = (struct vlan_ethhdr *)skb->data;
|
|
vhdr = (struct vlan_ethhdr *)skb->data;
|
|
vhdr->h_vlan_TCI = htons(tx_flags >>
|
|
vhdr->h_vlan_TCI = htons(tx_flags >>
|