diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
tree | 9b08af78085334af44414adafe0096276f8fe0ff /net/lapb/lapb_out.c | |
parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) |
Merge ARM fixes
Diffstat (limited to 'net/lapb/lapb_out.c')
-rw-r--r-- | net/lapb/lapb_out.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/lapb/lapb_out.c b/net/lapb/lapb_out.c index 49a761bd9314..339cc5f2684f 100644 --- a/net/lapb/lapb_out.c +++ b/net/lapb/lapb_out.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <linux/socket.h> | 19 | #include <linux/socket.h> |
20 | #include <linux/in.h> | 20 | #include <linux/in.h> |
21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
22 | #include <linux/sched.h> | ||
23 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
24 | #include <linux/string.h> | 23 | #include <linux/string.h> |
25 | #include <linux/sockios.h> | 24 | #include <linux/sockios.h> |
@@ -34,7 +33,7 @@ | |||
34 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
35 | #include <net/lapb.h> | 34 | #include <net/lapb.h> |
36 | 35 | ||
37 | /* | 36 | /* |
38 | * This procedure is passed a buffer descriptor for an iframe. It builds | 37 | * This procedure is passed a buffer descriptor for an iframe. It builds |
39 | * the rest of the control part of the frame and then writes it out. | 38 | * the rest of the control part of the frame and then writes it out. |
40 | */ | 39 | */ |
@@ -66,7 +65,7 @@ static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll | |||
66 | lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr); | 65 | lapb->dev, lapb->state, poll_bit, lapb->vs, lapb->vr); |
67 | #endif | 66 | #endif |
68 | 67 | ||
69 | lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); | 68 | lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); |
70 | } | 69 | } |
71 | 70 | ||
72 | void lapb_kick(struct lapb_cb *lapb) | 71 | void lapb_kick(struct lapb_cb *lapb) |