diff options
author | Rémi Denis-Courmont <remi.denis-courmont@nokia.com> | 2009-05-31 20:35:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-02 03:17:43 -0400 |
commit | bbd5898d39ab9f855c732f6f07e40e95b05cf52a (patch) | |
tree | 383f8dc9aa4727269693d1442c83dd780161c177 /net | |
parent | c930a66220bac0815cca74eef94ada221377ffba (diff) |
Phonet: fix accounting race between gprs_writeable() and gprs_xmit()
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/phonet/pep-gprs.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/phonet/pep-gprs.c b/net/phonet/pep-gprs.c index 4aa888584d20..851f6a3f8ddd 100644 --- a/net/phonet/pep-gprs.c +++ b/net/phonet/pep-gprs.c | |||
@@ -212,8 +212,9 @@ static int gprs_xmit(struct sk_buff *skb, struct net_device *dev) | |||
212 | dev->stats.tx_bytes += len; | 212 | dev->stats.tx_bytes += len; |
213 | } | 213 | } |
214 | 214 | ||
215 | if (!pep_writeable(sk)) | 215 | netif_stop_queue(dev); |
216 | netif_stop_queue(dev); | 216 | if (pep_writeable(sk)) |
217 | netif_wake_queue(dev); | ||
217 | return 0; | 218 | return 0; |
218 | } | 219 | } |
219 | 220 | ||