diff options
| author | Francois Romieu <romieu@fr.zoreil.com> | 2014-03-29 23:14:32 -0400 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-11 08:58:06 -0400 |
| commit | 8f12c0348397ee69af33fc8973b687d83a8759dc (patch) | |
| tree | 6499cdb7c0db62420323f7ce2e073fbf644ea622 | |
| parent | ea699569b150daa5d5f6c23040da997b83e4cfa3 (diff) | |
ixgbevf: remove open-coded skb_cow_head
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c index 905c26cfa600..d0799e8e31e4 100644 --- a/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | |||
| @@ -2839,6 +2839,7 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring, | |||
| 2839 | struct sk_buff *skb = first->skb; | 2839 | struct sk_buff *skb = first->skb; |
| 2840 | u32 vlan_macip_lens, type_tucmd; | 2840 | u32 vlan_macip_lens, type_tucmd; |
| 2841 | u32 mss_l4len_idx, l4len; | 2841 | u32 mss_l4len_idx, l4len; |
| 2842 | int err; | ||
| 2842 | 2843 | ||
| 2843 | if (skb->ip_summed != CHECKSUM_PARTIAL) | 2844 | if (skb->ip_summed != CHECKSUM_PARTIAL) |
| 2844 | return 0; | 2845 | return 0; |
| @@ -2846,11 +2847,9 @@ static int ixgbevf_tso(struct ixgbevf_ring *tx_ring, | |||
| 2846 | if (!skb_is_gso(skb)) | 2847 | if (!skb_is_gso(skb)) |
| 2847 | return 0; | 2848 | return 0; |
| 2848 | 2849 | ||
| 2849 | if (skb_header_cloned(skb)) { | 2850 | err = skb_cow_head(skb, 0); |
| 2850 | int err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); | 2851 | if (err < 0) |
| 2851 | if (err) | 2852 | return err; |
| 2852 | return err; | ||
| 2853 | } | ||
| 2854 | 2853 | ||
| 2855 | /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */ | 2854 | /* ADV DTYP TUCMD MKRLOC/ISCSIHEDLEN */ |
| 2856 | type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP; | 2855 | type_tucmd = IXGBE_ADVTXD_TUCMD_L4T_TCP; |
