aboutsummaryrefslogtreecommitdiffstats
path: root/net/core/dev.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-06-09 03:18:51 -0400
committerDavid S. Miller <davem@davemloft.net>2009-06-09 03:18:51 -0400
commit4cf704fbea96075942bd033fd75aa4e76ae1c8a1 (patch)
treef529e1d2f441125c48f81cebf076a29be4e5ac6f /net/core/dev.c
parent5b1a002ade68173f21b2126a778278df72202ba6 (diff)
net/core/dev.c: Use frag list abstraction interfaces.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/dev.c')
-rw-r--r--net/core/dev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index 1f38401fc028..4913089c91dc 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1820,7 +1820,7 @@ int dev_queue_xmit(struct sk_buff *skb)
1820 if (netif_needs_gso(dev, skb)) 1820 if (netif_needs_gso(dev, skb))
1821 goto gso; 1821 goto gso;
1822 1822
1823 if (skb_shinfo(skb)->frag_list && 1823 if (skb_has_frags(skb) &&
1824 !(dev->features & NETIF_F_FRAGLIST) && 1824 !(dev->features & NETIF_F_FRAGLIST) &&
1825 __skb_linearize(skb)) 1825 __skb_linearize(skb))
1826 goto out_kfree_skb; 1826 goto out_kfree_skb;
@@ -2407,7 +2407,7 @@ int dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
2407 if (!(skb->dev->features & NETIF_F_GRO)) 2407 if (!(skb->dev->features & NETIF_F_GRO))
2408 goto normal; 2408 goto normal;
2409 2409
2410 if (skb_is_gso(skb) || skb_shinfo(skb)->frag_list) 2410 if (skb_is_gso(skb) || skb_has_frags(skb))
2411 goto normal; 2411 goto normal;
2412 2412
2413 rcu_read_lock(); 2413 rcu_read_lock();