diff options
author | David S. Miller <davem@davemloft.net> | 2010-08-23 03:13:46 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-23 03:13:46 -0400 |
commit | 21dc330157454046dd7c494961277d76e1c957fe (patch) | |
tree | 4f030efa8d82f7eb9676acd4cfc74921a6d29972 /net/ipv6 | |
parent | 2d4833aae65589ba4317dd325fe20c8b25c14173 (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>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/ip6_output.c | 2 | ||||
-rw-r--r-- | net/ipv6/netfilter/nf_conntrack_reasm.c | 2 | ||||
-rw-r--r-- | net/ipv6/reassembly.c | 2 |
3 files changed, 3 insertions, 3 deletions
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 | ||