Phonet: fix accounting race between gprs_writeable() and gprs_xmit()
authorRémi Denis-Courmont <remi.denis-courmont@nokia.com>
Mon, 1 Jun 2009 00:35:16 +0000 (00:35 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 2 Jun 2009 07:17:43 +0000 (00:17 -0700)
In the unlikely event that gprs_writeable() and gprs_xmit() check for
writeability at the same, we could stop the device queue forever.

Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/phonet/pep-gprs.c

index 4aa888584d20991893272cd84688f4950c0c40e6..851f6a3f8dddb34d457d3f3d87ba6f9be1192228 100644 (file)
@@ -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;
 }