Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

1 files changed, 5 insertions, 4 deletions

diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c
index 4aa888584d20..480839dfc560 100644
--- a/net/phonet/pep-gprs.c
+++ b/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;
@@ -212,8 +212,9 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev)
                 dev->stats.tx_bytes += len;
         }
 
-        if (!pep_writeable(sk))
-                netif_stop_queue(dev);
+        netif_stop_queue(dev);
+        if (pep_writeable(sk))
+                netif_wake_queue(dev);
         return 0;
 }