diff options
| author | David S. Miller <davem@davemloft.net> | 2010-08-23 00:13:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-08-23 00:13:46 -0700 |
| commit | 21dc330157454046dd7c494961277d76e1c957fe (patch) | |
| tree | 4f030efa8d82f7eb9676acd4cfc74921a6d29972 /net/ipv4 | |
| parent | 2d4833aae65589ba4317dd325fe20c8b25c14173 (diff) | |
| download | linux-3.10-21dc330157454046dd7c494961277d76e1c957fe.tar.gz linux-3.10-21dc330157454046dd7c494961277d76e1c957fe.tar.bz2 linux-3.10-21dc330157454046dd7c494961277d76e1c957fe.zip | |
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/ipv4')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 2 | ||||
| -rw-r--r-- | net/ipv4/ip_output.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index b7c41654dde..f4dc879e258 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, /* If the first fragment is fragmented itself, we split * it to two chunks: the first with data and paged part * and the second, holding only fragments. */ - if (skb_has_frags(head)) { + if (skb_has_frag_list(head)) { struct sk_buff *clone; int i, plen = 0; diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c index e807492f177..6d2753c7ffd 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 *)) * LATER: this step can be merged to real generation of fragments, * we can switch to copy when see the first bad fragment. */ - if (skb_has_frags(skb)) { + if (skb_has_frag_list(skb)) { struct sk_buff *frag; int first_len = skb_pagelen(skb); int truesizes = 0; |