From b797fd18679aa6b2f755d2afa3b47328ad497a9e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 9 Jun 2009 00:21:58 -0700 Subject: [PATCH] --- yaml --- r: 150765 b: refs/heads/master c: 5c313e9a7773ec4d7ac554e841fba583f7c63aba h: refs/heads/master i: 150763: b3b397e84337fa4b9da37af36ae229bd41c00ce8 v: v3 --- [refs] | 2 +- trunk/net/phonet/pep-gprs.c | 4 ++-- trunk/net/phonet/pep.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 381b076389a0..c58ef88bf6ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 343a99724e4431d8618bea2eb7552e12c965425a +refs/heads/master: 5c313e9a7773ec4d7ac554e841fba583f7c63aba diff --git a/trunk/net/phonet/pep-gprs.c b/trunk/net/phonet/pep-gprs.c index 851f6a3f8ddd..480839dfc560 100644 --- a/trunk/net/phonet/pep-gprs.c +++ b/trunk/net/phonet/pep-gprs.c @@ -115,10 +115,10 @@ static int gprs_recv(struct gprs_dev *gp, struct sk_buff *skb) rskb->truesize += rskb->len; /* Avoid nested fragments */ - for (fs = skb_shinfo(skb)->frag_list; fs; fs = fs->next) + skb_walk_frags(skb, fs) flen += fs->len; skb->next = skb_shinfo(skb)->frag_list; - skb_shinfo(skb)->frag_list = NULL; + skb_frag_list_init(skb); skb->len -= flen; skb->data_len -= flen; skb->truesize -= flen; diff --git a/trunk/net/phonet/pep.c b/trunk/net/phonet/pep.c index 8ad2b5333881..eef833ea6d7b 100644 --- a/trunk/net/phonet/pep.c +++ b/trunk/net/phonet/pep.c @@ -940,10 +940,10 @@ int pep_write(struct sock *sk, struct sk_buff *skb) rskb->truesize += rskb->len; /* Avoid nested fragments */ - for (fs = skb_shinfo(skb)->frag_list; fs; fs = fs->next) + skb_walk_frags(skb, fs) flen += fs->len; skb->next = skb_shinfo(skb)->frag_list; - skb_shinfo(skb)->frag_list = NULL; + skb_frag_list_init(skb); skb->len -= flen; skb->data_len -= flen; skb->truesize -= flen;