aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2008-12-16 02:27:47 -0500
committerDavid S. Miller <davem@davemloft.net>2008-12-16 02:27:47 -0500
commit1a881f27c50b4fbd6858a8696a189263621136b0 (patch)
treeca0327e3543a0535cfd855beedb1b171f6aebf06 /net/core
parent89319d3801d1d3ac29c7df1f067038986f267d29 (diff)
net: Add frag_list support to GSO
This patch allows GSO to handle frag_list in a limited way for the purposes of allowing packets merged by GRO to be refragmented on output. Most hardware won't (and aren't expected to) support handling GRO frag_list packets directly. Therefore we will perform GSO in software for those cases. However, for drivers that can support it (such as virtual NICs) we may not have to segment the packets at all. Whether the added overhead of GRO/GSO is worthwhile for bridges and routers when weighed against the benefit of potentially increasing the MTU within the host is still an open question. However, for the case of host nodes this is undoubtedly a win. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/dev.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index f54cac76438a..e415f0b0d0d0 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1533,8 +1533,6 @@ struct sk_buff *skb_gso_segment(struct sk_buff *skb, int features)
1533 __be16 type = skb->protocol; 1533 __be16 type = skb->protocol;
1534 int err; 1534 int err;
1535 1535
1536 BUG_ON(skb_shinfo(skb)->frag_list);
1537
1538 skb_reset_mac_header(skb); 1536 skb_reset_mac_header(skb);
1539 skb->mac_len = skb->network_header - skb->mac_header; 1537 skb->mac_len = skb->network_header - skb->mac_header;
1540 __skb_pull(skb, skb->mac_len); 1538 __skb_pull(skb, skb->mac_len);