|
@@ -340,7 +340,7 @@ static void skb_release_data(struct sk_buff *skb)
|
|
|
put_page(skb_shinfo(skb)->frags[i].page);
|
|
|
}
|
|
|
|
|
|
- if (skb_has_frags(skb))
|
|
|
+ if (skb_has_frag_list(skb))
|
|
|
skb_drop_fraglist(skb);
|
|
|
|
|
|
kfree(skb->head);
|
|
@@ -759,7 +759,7 @@ struct sk_buff *pskb_copy(struct sk_buff *skb, gfp_t gfp_mask)
|
|
|
skb_shinfo(n)->nr_frags = i;
|
|
|
}
|
|
|
|
|
|
- if (skb_has_frags(skb)) {
|
|
|
+ if (skb_has_frag_list(skb)) {
|
|
|
skb_shinfo(n)->frag_list = skb_shinfo(skb)->frag_list;
|
|
|
skb_clone_fraglist(n);
|
|
|
}
|
|
@@ -822,7 +822,7 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail,
|
|
|
for (i = 0; i < skb_shinfo(skb)->nr_frags; i++)
|
|
|
get_page(skb_shinfo(skb)->frags[i].page);
|
|
|
|
|
|
- if (skb_has_frags(skb))
|
|
|
+ if (skb_has_frag_list(skb))
|
|
|
skb_clone_fraglist(skb);
|
|
|
|
|
|
skb_release_data(skb);
|
|
@@ -1099,7 +1099,7 @@ drop_pages:
|
|
|
for (; i < nfrags; i++)
|
|
|
put_page(skb_shinfo(skb)->frags[i].page);
|
|
|
|
|
|
- if (skb_has_frags(skb))
|
|
|
+ if (skb_has_frag_list(skb))
|
|
|
skb_drop_fraglist(skb);
|
|
|
goto done;
|
|
|
}
|
|
@@ -1194,7 +1194,7 @@ unsigned char *__pskb_pull_tail(struct sk_buff *skb, int delta)
|
|
|
/* Optimization: no fragments, no reasons to preestimate
|
|
|
* size of pulled pages. Superb.
|
|
|
*/
|
|
|
- if (!skb_has_frags(skb))
|
|
|
+ if (!skb_has_frag_list(skb))
|
|
|
goto pull_pages;
|
|
|
|
|
|
/* Estimate size of pulled pages. */
|
|
@@ -2323,7 +2323,7 @@ next_skb:
|
|
|
st->frag_data = NULL;
|
|
|
}
|
|
|
|
|
|
- if (st->root_skb == st->cur_skb && skb_has_frags(st->root_skb)) {
|
|
|
+ if (st->root_skb == st->cur_skb && skb_has_frag_list(st->root_skb)) {
|
|
|
st->cur_skb = skb_shinfo(st->root_skb)->frag_list;
|
|
|
st->frag_idx = 0;
|
|
|
goto next_skb;
|
|
@@ -2889,7 +2889,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
|
|
|
return -ENOMEM;
|
|
|
|
|
|
/* Easy case. Most of packets will go this way. */
|
|
|
- if (!skb_has_frags(skb)) {
|
|
|
+ if (!skb_has_frag_list(skb)) {
|
|
|
/* A little of trouble, not enough of space for trailer.
|
|
|
* This should not happen, when stack is tuned to generate
|
|
|
* 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)
|
|
|
|
|
|
if (skb1->next == NULL && tailbits) {
|
|
|
if (skb_shinfo(skb1)->nr_frags ||
|
|
|
- skb_has_frags(skb1) ||
|
|
|
+ skb_has_frag_list(skb1) ||
|
|
|
skb_tailroom(skb1) < tailbits)
|
|
|
ntail = tailbits + 128;
|
|
|
}
|
|
@@ -2933,7 +2933,7 @@ int skb_cow_data(struct sk_buff *skb, int tailbits, struct sk_buff **trailer)
|
|
|
skb_cloned(skb1) ||
|
|
|
ntail ||
|
|
|
skb_shinfo(skb1)->nr_frags ||
|
|
|
- skb_has_frags(skb1)) {
|
|
|
+ skb_has_frag_list(skb1)) {
|
|
|
struct sk_buff *skb2;
|
|
|
|
|
|
/* Fuck, we are miserable poor guys... */
|