igbvf: remove open-coded skb_cow_head
authorFrancois Romieu <romieu@fr.zoreil.com>
Sun, 30 Mar 2014 03:14:22 +0000 (03:14 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Fri, 11 Apr 2014 12:58:09 +0000 (05:58 -0700)
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>
drivers/net/ethernet/intel/igbvf/netdev.c

index b7ab03a2f28f702f604e9f5accd9fb4529b85e70..d608599e123a9d8634905c607faac60da85618f6 100644 (file)
@@ -1910,20 +1910,18 @@ static int igbvf_tso(struct igbvf_adapter *adapter,
                      struct sk_buff *skb, u32 tx_flags, u8 *hdr_len)
 {
        struct e1000_adv_tx_context_desc *context_desc;
-       unsigned int i;
-       int err;
        struct igbvf_buffer *buffer_info;
        u32 info = 0, tu_cmd = 0;
        u32 mss_l4len_idx, l4len;
+       unsigned int i;
+       int err;
+
        *hdr_len = 0;
 
-       if (skb_header_cloned(skb)) {
-               err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
-               if (err) {
-                       dev_err(&adapter->pdev->dev,
-                               "igbvf_tso returning an error\n");
-                       return err;
-               }
+       err = skb_cow_head(skb, 0);
+       if (err < 0) {
+               dev_err(&adapter->pdev->dev, "igbvf_tso returning an error\n");
+               return err;
        }
 
        l4len = tcp_hdrlen(skb);