diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/ax25/ax25_subr.c | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/ax25/ax25_subr.c')
| -rw-r--r-- | net/ax25/ax25_subr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ax25/ax25_subr.c b/net/ax25/ax25_subr.c index 99694b57f6f5..c41dbe5fadee 100644 --- a/net/ax25/ax25_subr.c +++ b/net/ax25/ax25_subr.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <linux/netdevice.h> | 24 | #include <linux/netdevice.h> |
| 25 | #include <linux/skbuff.h> | 25 | #include <linux/skbuff.h> |
| 26 | #include <net/sock.h> | 26 | #include <net/sock.h> |
| 27 | #include <net/tcp.h> | 27 | #include <net/tcp_states.h> |
| 28 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 29 | #include <asm/system.h> | 29 | #include <asm/system.h> |
| 30 | #include <linux/fcntl.h> | 30 | #include <linux/fcntl.h> |
| @@ -76,7 +76,7 @@ void ax25_requeue_frames(ax25_cb *ax25) | |||
| 76 | if (skb_prev == NULL) | 76 | if (skb_prev == NULL) |
| 77 | skb_queue_head(&ax25->write_queue, skb); | 77 | skb_queue_head(&ax25->write_queue, skb); |
| 78 | else | 78 | else |
| 79 | skb_append(skb_prev, skb); | 79 | skb_append(skb_prev, skb, &ax25->write_queue); |
| 80 | skb_prev = skb; | 80 | skb_prev = skb; |
| 81 | } | 81 | } |
| 82 | } | 82 | } |