diff options
author | Francois Romieu <romieu@fr.zoreil.com> | 2014-03-29 23:14:22 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-04-11 08:58:09 -0400 |
commit | 6b8f07b4904b3fcd17dcb91165a218266727b4cf (patch) | |
tree | 2e184b3f25231e7c8fca51046451cc72db06c30a | |
parent | 5499a968d49f22ef166a360ffd74364bfb7233d6 (diff) |
igbvf: 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/igbvf/netdev.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index b7ab03a2f28f..d608599e123a 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c | |||
@@ -1910,20 +1910,18 @@ static int igbvf_tso(struct igbvf_adapter *adapter, | |||
1910 | struct sk_buff *skb, u32 tx_flags, u8 *hdr_len) | 1910 | struct sk_buff *skb, u32 tx_flags, u8 *hdr_len) |
1911 | { | 1911 | { |
1912 | struct e1000_adv_tx_context_desc *context_desc; | 1912 | struct e1000_adv_tx_context_desc *context_desc; |
1913 | unsigned int i; | ||
1914 | int err; | ||
1915 | struct igbvf_buffer *buffer_info; | 1913 | struct igbvf_buffer *buffer_info; |
1916 | u32 info = 0, tu_cmd = 0; | 1914 | u32 info = 0, tu_cmd = 0; |
1917 | u32 mss_l4len_idx, l4len; | 1915 | u32 mss_l4len_idx, l4len; |
1916 | unsigned int i; | ||
1917 | int err; | ||
1918 | |||
1918 | *hdr_len = 0; | 1919 | *hdr_len = 0; |
1919 | 1920 | ||
1920 | if (skb_header_cloned(skb)) { | 1921 | err = skb_cow_head(skb, 0); |
1921 | err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); | 1922 | if (err < 0) { |
1922 | if (err) { | 1923 | dev_err(&adapter->pdev->dev, "igbvf_tso returning an error\n"); |
1923 | dev_err(&adapter->pdev->dev, | 1924 | return err; |
1924 | "igbvf_tso returning an error\n"); | ||
1925 | return err; | ||
1926 | } | ||
1927 | } | 1925 | } |
1928 | 1926 | ||
1929 | l4len = tcp_hdrlen(skb); | 1927 | l4len = tcp_hdrlen(skb); |