diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2014-03-29 23:14:11 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-11 08:58:08 -0400 |
| commit | 06c14e5adbccfc2b6e0cfc1f7ce4f4bf73791d28 (patch) | |
| tree | 7c2d06aa23175269e15377438de27363c1392fee | |
| parent | bcf1f57fbffc0869762f0daee7fe1973cc459719 (diff) | |
igb: remove open-coded skb_cow_head
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 30198185d19a..720ad122b26d 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c | |||
| @@ -4605,6 +4605,7 @@ static int igb_tso(struct igb_ring *tx_ring, | |||
| 4605 | struct sk_buff *skb = first->skb; | 4605 | struct sk_buff *skb = first->skb; |
| 4606 | u32 vlan_macip_lens, type_tucmd; | 4606 | u32 vlan_macip_lens, type_tucmd; |
| 4607 | u32 mss_l4len_idx, l4len; | 4607 | u32 mss_l4len_idx, l4len; |
| 4608 | int err; | ||
| 4608 | 4609 | ||
| 4609 | if (skb->ip_summed != CHECKSUM_PARTIAL) | 4610 | if (skb->ip_summed != CHECKSUM_PARTIAL) |
| 4610 | return 0; | 4611 | return 0; |
| @@ -4612,11 +4613,9 @@ static int igb_tso(struct igb_ring *tx_ring, | |||
| 4612 | if (!skb_is_gso(skb)) | 4613 | if (!skb_is_gso(skb)) |
| 4613 | return 0; | 4614 | return 0; |
| 4614 | 4615 | ||
| 4615 | if (skb_header_cloned(skb)) { | 4616 | err = skb_cow_head(skb, 0); |
| 4616 | int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); | 4617 | if (err < 0) |
| 4617 | if (err) | 4618 | return err; |
| 4618 | return err; | ||
| 4619 | } | ||
| 4620 | 4619 | ||
| 4621 | /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */ | 4620 | /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */ |
| 4622 | type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP; | 4621 | type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP; |
