diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 15:25:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-13 15:25:59 +0100 |
| commit | 30beab1491f0b96b2f23d3fb68af01fd921a16d8 (patch) | |
| tree | c580bdc0846269fbb10feeda901ecec1a48ee2ef /net/decnet/dn_nsp_out.c | |
| parent | 21af6c4f2aa5f63138871b4ddd77d7ebf2588c9d (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
| download | op-kernel-dev-30beab1491f0b96b2f23d3fb68af01fd921a16d8.zip op-kernel-dev-30beab1491f0b96b2f23d3fb68af01fd921a16d8.tar.gz | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'net/decnet/dn_nsp_out.c')
| -rw-r--r-- | net/decnet/dn_nsp_out.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index 42abbf3..8cce1fd 100644 --- a/net/decnet/dn_nsp_out.c +++ b/net/decnet/dn_nsp_out.c @@ -342,7 +342,8 @@ int dn_nsp_xmit_timeout(struct sock *sk) dn_nsp_output(sk); - if (skb_queue_len(&scp->data_xmit_queue) || skb_queue_len(&scp->other_xmit_queue)) + if (!skb_queue_empty(&scp->data_xmit_queue) || + !skb_queue_empty(&scp->other_xmit_queue)) scp->persist = dn_nsp_persist(sk); return 0; |
