diff options
| author | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2005-09-03 02:44:09 -0400 |
| commit | 129521dcc94f781890f8f668219ab79f0073ff9f (patch) | |
| tree | 9f70707c88da65577f38814fe37b24c4b4957d64 /net/decnet/dn_nsp_out.c | |
| parent | 824b558bbe2c298b165cdb54c33718994dda30bb (diff) | |
| parent | f505380ba7b98ec97bf25300c2a58aeae903530b (diff) | |
Merge linux-2.6 into linux-acpi-2.6 test
Diffstat (limited to 'net/decnet/dn_nsp_out.c')
| -rw-r--r-- | net/decnet/dn_nsp_out.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/dn_nsp_out.c b/net/decnet/dn_nsp_out.c index 8cce1fdbda90..e0bebf4bbcad 100644 --- a/net/decnet/dn_nsp_out.c +++ b/net/decnet/dn_nsp_out.c | |||
| @@ -479,7 +479,7 @@ int dn_nsp_check_xmit_queue(struct sock *sk, struct sk_buff *skb, struct sk_buff | |||
| 479 | xmit_count = cb2->xmit_count; | 479 | xmit_count = cb2->xmit_count; |
| 480 | segnum = cb2->segnum; | 480 | segnum = cb2->segnum; |
| 481 | /* Remove and drop ack'ed packet */ | 481 | /* Remove and drop ack'ed packet */ |
| 482 | skb_unlink(ack); | 482 | skb_unlink(ack, q); |
| 483 | kfree_skb(ack); | 483 | kfree_skb(ack); |
| 484 | ack = NULL; | 484 | ack = NULL; |
| 485 | 485 | ||