aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-08-23 03:13:46 -0400
committerDavid S. Miller <davem@davemloft.net>2010-08-23 03:13:46 -0400
commit21dc330157454046dd7c494961277d76e1c957fe (patch)
tree4f030efa8d82f7eb9676acd4cfc74921a6d29972
parent2d4833aae65589ba4317dd325fe20c8b25c14173 (diff)
net: Rename skb_has_frags to skb_has_frag_list
SKBs can be "fragmented" in two ways, via a page array (called skb_shinfo(skb)->frags[]) and via a list of SKBs (called skb_shinfo(skb)->frag_list). Since skb_has_frags() tests the latter, it's name is confusing since it sounds more like it's testing the former. Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h2
-rw-r--r--include/linux/skbuff.h4
-rw-r--r--net/core/dev.c4
-rw-r--r--net/core/skbuff.c18
-rw-r--r--net/ipv4/ip_fragment.c2
-rw-r--r--net/ipv4/ip_output.c2
-rw-r--r--net/ipv6/ip6_output.c2
-rw-r--r--net/ipv6/netfilter/nf_conntrack_reasm.c2
-rw-r--r--net/ipv6/reassembly.c2
9 files changed, 19 insertions, 19 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 46c36ffe20ee..ce2de8b64083 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2191,7 +2191,7 @@ static inline int net_gso_ok(int features, int gso_type)
2191static inline int skb_gso_ok(struct sk_buff *skb, int features) 2191static inline int skb_gso_ok(struct sk_buff *skb, int features)
2192{ 2192{
2193 return net_gso_ok(features, skb_shinfo(skb)->gso_type) && 2193 return net_gso_ok(features, skb_shinfo(skb)->gso_type) &&
2194 (!skb_has_frags(skb) || (features & NETIF_F_FRAGLIST)); 2194 (!skb_has_frag_list(skb) || (features & NETIF_F_FRAGLIST));
2195} 2195}
2196 2196
2197static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb) 2197static inline int netif_needs_gso(struct net_device *dev, struct sk_buff *skb)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index f067c95cf18a..f900ffcd847e 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -1120,7 +1120,7 @@ extern void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page,
1120 int off, int size); 1120 int off, int size);
1121 1121
1122#define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags) 1122#define SKB_PAGE_ASSERT(skb) BUG_ON(skb_shinfo(skb)->nr_frags)
1123#define SKB_FRAG_ASSERT(skb) BUG_ON(skb_has_frags(skb)) 1123#define SKB_FRAG_ASSERT(skb) BUG_ON(skb_has_frag_list(skb))
1124#define SKB_LINEAR_ASSERT(skb) BUG_ON(skb_is_nonlinear(skb)) 1124#define SKB_LINEAR_ASSERT(skb) BUG_ON(skb_is_nonlinear(skb))
1125 1125
1126#ifdef NET_SKBUFF_DATA_USES_OFFSET 1126#ifdef NET_SKBUFF_DATA_USES_OFFSET
@@ -1784,7 +1784,7 @@ static inline int pskb_trim_rcsum(struct sk_buff *skb, unsigned int len)
1784 skb = skb->prev) 1784 skb = skb->prev)
1785 1785
1786 1786
1787static inline bool skb_has_frags(const struct sk_buff *skb) 1787static inline bool skb_has_frag_list(const struct sk_buff *skb)
1788{ 1788{
1789 return skb_shinfo(skb)->frag_list != NULL; 1789 return skb_shinfo(skb)->frag_list != NULL;
1790} 1790}
diff --git a/net/core/dev.c b/net/core/dev.c
index d569f88bcf80..859e30ff044a 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1930,7 +1930,7 @@ static inline int skb_needs_linearize(struct sk_buff *skb,
1930 struct net_device *dev) 1930 struct net_device *dev)
1931{ 1931{
1932 return skb_is_nonlinear(skb) && 1932 return skb_is_nonlinear(skb) &&
1933 ((skb_has_frags(skb) && !(dev->features & NETIF_F_FRAGLIST)) || 1933 ((skb_has_frag_list(skb) && !(dev->features & NETIF_F_FRAGLIST)) ||
1934 (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) || 1934 (skb_shinfo(skb)->nr_frags && (!(dev->features & NETIF_F_SG) ||
1935 illegal_highdma(dev, skb)))); 1935 illegal_highdma(dev, skb))));
1936} 1936}
@@ -3090,7 +3090,7 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)
3090 if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb)) 3090 if (!(skb->dev->features & NETIF_F_GRO) || netpoll_rx_on(skb))
3091 goto normal; 3091 goto normal;
3092 3092
3093 if (skb_is_gso(skb) || skb_has_frags(skb)) 3093 if (skb_is_gso(skb) || skb_has_frag_list(skb))
3094 goto normal; 3094 goto normal;
3095 3095
3096 rcu_read_lock(); 3096 rcu_read_lock();
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 99ef721f773d..e2535fb4985d 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -340,7 +340,7 @@ static void skb_release_data(struct sk_buff *skb)
340 put_page(skb_shinfo(skb)->frags[i].page); 340 put_page(skb_shinfo(skb)->frags[i].page);
341 } 341 }
342 342
343 if (skb_has_frags(skb)) 343 if (skb_has_frag_list(skb))
344 skb_drop_fraglist(skb); 344 skb_drop_fraglist(skb);
345 345
346 kfree(skb->head); 346 kfree(skb->head);
@@ -759,7 +759,7 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask)
759 skb_shinfo(n)->nr_frags = i; 759 skb_shinfo(n)->nr_frags = i;
760 } 760 }
761 761
762 if (skb_has_frags(skb)) { 762 if (skb_has_frag_list(skb)) {
763 skb_shinfo(n)->frag_list = skb_shinfo(skb)->frag_list; 763 skb_shinfo(n)->frag_list = skb_shinfo(skb)->frag_list;
764 skb_clone_fraglist(n); 764 skb_clone_fraglist(n);
765 } 765 }
@@ -822,7 +822,7 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
822 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) 822 for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
823 get_page(skb_shinfo(skb)->frags[i].page); 823 get_page(skb_shinfo(skb)->frags[i].page);
824 824
825 if (skb_has_frags(skb)) 825 if (skb_has_frag_list(skb))
826 skb_clone_fraglist(skb); 826 skb_clone_fraglist(skb);
827 827
828 skb_release_data(skb); 828 skb_release_data(skb);
@@ -1099,7 +1099,7 @@ drop_pages:
1099 for (; i < nfrags; i++) 1099 for (; i < nfrags; i++)
1100 put_page(skb_shinfo(skb)->frags[i].page); 1100 put_page(skb_shinfo(skb)->frags[i].page);
1101 1101
1102 if (skb_has_frags(skb)) 1102 if (skb_has_frag_list(skb))
1103 skb_drop_fraglist(skb); 1103 skb_drop_fraglist(skb);
1104 goto done; 1104 goto done;
1105 } 1105 }
@@ -1194,7 +1194,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta)
1194 /* Optimization: no fragments, no reasons to preestimate 1194 /* Optimization: no fragments, no reasons to preestimate
1195 * size of pulled pages. Superb. 1195 * size of pulled pages. Superb.
1196 */ 1196 */
1197 if (!skb_has_frags(skb)) 1197 if (!skb_has_frag_list(skb))
1198 goto pull_pages; 1198 goto pull_pages;
1199 1199
1200 /* Estimate size of pulled pages. */ 1200 /* Estimate size of pulled pages. */
@@ -2323,7 +2323,7 @@ next_skb:
2323 st->frag_data = NULL; 2323 st->frag_data = NULL;
2324 } 2324 }
2325 2325
2326 if (st->root_skb == st->cur_skb && skb_has_frags(st->root_skb)) { 2326 if (st->root_skb == st->cur_skb && skb_has_frag_list(st->root_skb)) {
2327 st->cur_skb = skb_shinfo(st->root_skb)->frag_list; 2327 st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
2328 st->frag_idx = 0; 2328 st->frag_idx = 0;
2329 goto next_skb; 2329 goto next_skb;
@@ -2889,7 +2889,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
2889 return -ENOMEM; 2889 return -ENOMEM;
2890 2890
2891 /* Easy case. Most of packets will go this way. */ 2891 /* Easy case. Most of packets will go this way. */
2892 if (!skb_has_frags(skb)) { 2892 if (!skb_has_frag_list(skb)) {
2893 /* A little of trouble, not enough of space for trailer. 2893 /* A little of trouble, not enough of space for trailer.
2894 * This should not happen, when stack is tuned to generate 2894 * This should not happen, when stack is tuned to generate
2895 * good frames. OK, on miss we reallocate and reserve even more 2895 * good frames. OK, on miss we reallocate and reserve even more
@@ -2924,7 +2924,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
2924 2924
2925 if (skb1->next == NULL && tailbits) { 2925 if (skb1->next == NULL && tailbits) {
2926 if (skb_shinfo(skb1)->nr_frags || 2926 if (skb_shinfo(skb1)->nr_frags ||
2927 skb_has_frags(skb1) || 2927 skb_has_frag_list(skb1) ||
2928 skb_tailroom(skb1) < tailbits) 2928 skb_tailroom(skb1) < tailbits)
2929 ntail = tailbits + 128; 2929 ntail = tailbits + 128;
2930 } 2930 }
@@ -2933,7 +2933,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
2933 skb_cloned(skb1) || 2933 skb_cloned(skb1) ||
2934 ntail || 2934 ntail ||
2935 skb_shinfo(skb1)->nr_frags || 2935 skb_shinfo(skb1)->nr_frags ||
2936 skb_has_frags(skb1)) { 2936 skb_has_frag_list(skb1)) {
2937 struct sk_buff *skb2; 2937 struct sk_buff *skb2;
2938 2938
2939 /* Fuck, we are miserable poor guys... */ 2939 /* Fuck, we are miserable poor guys... */
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index b7c41654dde5..f4dc879e258e 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -542,7 +542,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
542 /* If the first fragment is fragmented itself, we split 542 /* If the first fragment is fragmented itself, we split
543 * it to two chunks: the first with data and paged part 543 * it to two chunks: the first with data and paged part
544 * and the second, holding only fragments. */ 544 * and the second, holding only fragments. */
545 if (skb_has_frags(head)) { 545 if (skb_has_frag_list(head)) {
546 struct sk_buff *clone; 546 struct sk_buff *clone;
547 int i, plen = 0; 547 int i, plen = 0;
548 548
diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index e807492f1777..6d2753c7ffdd 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -487,7 +487,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
487 * LATER: this step can be merged to real generation of fragments, 487 * LATER: this step can be merged to real generation of fragments,
488 * we can switch to copy when see the first bad fragment. 488 * we can switch to copy when see the first bad fragment.
489 */ 489 */
490 if (skb_has_frags(skb)) { 490 if (skb_has_frag_list(skb)) {
491 struct sk_buff *frag; 491 struct sk_buff *frag;
492 int first_len = skb_pagelen(skb); 492 int first_len = skb_pagelen(skb);
493 int truesizes = 0; 493 int truesizes = 0;
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index d40b330c0ee6..1838927a2243 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -637,7 +637,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
637 } 637 }
638 mtu -= hlen + sizeof(struct frag_hdr); 638 mtu -= hlen + sizeof(struct frag_hdr);
639 639
640 if (skb_has_frags(skb)) { 640 if (skb_has_frag_list(skb)) {
641 int first_len = skb_pagelen(skb); 641 int first_len = skb_pagelen(skb);
642 int truesizes = 0; 642 int truesizes = 0;
643 643
diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 13ef5bc05cf5..089c598773c7 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -413,7 +413,7 @@ nf_ct_frag6_reasm(struct nf_ct_frag6_queue *fq, struct net_device *dev)
413 /* If the first fragment is fragmented itself, we split 413 /* If the first fragment is fragmented itself, we split
414 * it to two chunks: the first with data and paged part 414 * it to two chunks: the first with data and paged part
415 * and the second, holding only fragments. */ 415 * and the second, holding only fragments. */
416 if (skb_has_frags(head)) { 416 if (skb_has_frag_list(head)) {
417 struct sk_buff *clone; 417 struct sk_buff *clone;
418 int i, plen = 0; 418 int i, plen = 0;
419 419
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 545c4141b755..8aea3f3f18d7 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -499,7 +499,7 @@ static int ip6_frag_reasm(struct frag_queue *fq, struct sk_buff *prev,
499 /* If the first fragment is fragmented itself, we split 499 /* If the first fragment is fragmented itself, we split
500 * it to two chunks: the first with data and paged part 500 * it to two chunks: the first with data and paged part
501 * and the second, holding only fragments. */ 501 * and the second, holding only fragments. */
502 if (skb_has_frags(head)) { 502 if (skb_has_frag_list(head)) {
503 struct sk_buff *clone; 503 struct sk_buff *clone;
504 int i, plen = 0; 504 int i, plen = 0;
505 505