projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bcf1f57
)
igb: remove open-coded skb_cow_head
author
Francois Romieu
<
[email protected]
>
Sun, 30 Mar 2014 03:14:11 +0000
(
03:14
+0000)
committer
Jeff Kirsher
<
[email protected]
>
Fri, 11 Apr 2014 12:58:08 +0000
(
05:58
-0700)
Signed-off-by: Francois Romieu <
[email protected]
>
Cc: Jesse Brandeburg <
[email protected]
>
Tested-by: Aaron Brown <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/ethernet/intel/igb/igb_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/igb/igb_main.c
b/drivers/net/ethernet/intel/igb/igb_main.c
index 30198185d19ae413850b0f4e11c4a4ddb8d75406..720ad122b26d63ee20a48ee1cf4468733a2e2ae5 100644
(file)
--- 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,
struct sk_buff *skb = first->skb;
u32 vlan_macip_lens, type_tucmd;
u32 mss_l4len_idx, l4len;
+ int err;
if (skb->ip_summed != CHECKSUM_PARTIAL)
return 0;
@@
-4612,11
+4613,9
@@
static int igb_tso(struct igb_ring *tx_ring,
if (!skb_is_gso(skb))
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 */
type_tucmd = E1000_ADVTXD_TUCMD_L4T_TCP;