Skip to content

L
linux
Commit 457a6c8c authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge master.kernel.org:/home/acme/BK/x25-2.5 

into nuts.ninka.net:/home/davem/src/BK/net-2.5
parents 1b924668 a134be24
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 638 additions and 443 deletions
include/net/lapb.h
View file @ 457a6c8c
...@@ -78,8 +78,8 @@ struct lapb_frame { ...@@ -78,8 +78,8 @@ struct lapb_frame {
/* /*
* The per LAPB connection control structure. * The per LAPB connection control structure.
*/ */
typedef struct lapb_cb { struct lapb_cb {
struct lapb_cb *next; struct list_head node;
void *token; void *token;
/* Link status fields */ /* Link status fields */
...@@ -100,43 +100,45 @@ typedef struct lapb_cb { ...@@ -100,43 +100,45 @@ typedef struct lapb_cb {
/* FRMR control information */ /* FRMR control information */
struct lapb_frame frmr_data; struct lapb_frame frmr_data;
unsigned char frmr_type; unsigned char frmr_type;
} lapb_cb;
atomic_t refcnt;
};
/* lapb_iface.c */ /* lapb_iface.c */
extern void lapb_connect_confirmation(lapb_cb *, int); extern void lapb_connect_confirmation(struct lapb_cb *lapb, int);
extern void lapb_connect_indication(lapb_cb *, int); extern void lapb_connect_indication(struct lapb_cb *lapb, int);
extern void lapb_disconnect_confirmation(lapb_cb *, int); extern void lapb_disconnect_confirmation(struct lapb_cb *lapb, int);
extern void lapb_disconnect_indication(lapb_cb *, int); extern void lapb_disconnect_indication(struct lapb_cb *lapb, int);
extern int lapb_data_indication(lapb_cb *, struct sk_buff *); extern int lapb_data_indication(struct lapb_cb *lapb, struct sk_buff *);
extern int lapb_data_transmit(lapb_cb *, struct sk_buff *); extern int lapb_data_transmit(struct lapb_cb *lapb, struct sk_buff *);
/* lapb_in.c */ /* lapb_in.c */
extern void lapb_data_input(lapb_cb *, struct sk_buff *); extern void lapb_data_input(struct lapb_cb *lapb, struct sk_buff *);
/* lapb_out.c */ /* lapb_out.c */
extern void lapb_kick(lapb_cb *); extern void lapb_kick(struct lapb_cb *lapb);
extern void lapb_transmit_buffer(lapb_cb *, struct sk_buff *, int); extern void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *, int);
extern void lapb_establish_data_link(lapb_cb *); extern void lapb_establish_data_link(struct lapb_cb *lapb);
extern void lapb_enquiry_response(lapb_cb *); extern void lapb_enquiry_response(struct lapb_cb *lapb);
extern void lapb_timeout_response(lapb_cb *); extern void lapb_timeout_response(struct lapb_cb *lapb);
extern void lapb_check_iframes_acked(lapb_cb *, unsigned short); extern void lapb_check_iframes_acked(struct lapb_cb *lapb, unsigned short);
extern void lapb_check_need_response(lapb_cb *, int, int); extern void lapb_check_need_response(struct lapb_cb *lapb, int, int);
/* lapb_subr.c */ /* lapb_subr.c */
extern void lapb_clear_queues(lapb_cb *); extern void lapb_clear_queues(struct lapb_cb *lapb);
extern void lapb_frames_acked(lapb_cb *, unsigned short); extern void lapb_frames_acked(struct lapb_cb *lapb, unsigned short);
extern void lapb_requeue_frames(lapb_cb *); extern void lapb_requeue_frames(struct lapb_cb *lapb);
extern int lapb_validate_nr(lapb_cb *, unsigned short); extern int lapb_validate_nr(struct lapb_cb *lapb, unsigned short);
extern void lapb_decode(lapb_cb *, struct sk_buff *, struct lapb_frame *); extern void lapb_decode(struct lapb_cb *lapb, struct sk_buff *, struct lapb_frame *);
extern void lapb_send_control(lapb_cb *, int, int, int); extern void lapb_send_control(struct lapb_cb *lapb, int, int, int);
extern void lapb_transmit_frmr(lapb_cb *); extern void lapb_transmit_frmr(struct lapb_cb *lapb);
/* lapb_timer.c */ /* lapb_timer.c */
extern void lapb_start_t1timer(lapb_cb *); extern void lapb_start_t1timer(struct lapb_cb *lapb);
extern void lapb_start_t2timer(lapb_cb *); extern void lapb_start_t2timer(struct lapb_cb *lapb);
extern void lapb_stop_t1timer(lapb_cb *); extern void lapb_stop_t1timer(struct lapb_cb *lapb);
extern void lapb_stop_t2timer(lapb_cb *); extern void lapb_stop_t2timer(struct lapb_cb *lapb);
extern int lapb_t1timer_running(lapb_cb *); extern int lapb_t1timer_running(struct lapb_cb *lapb);
/* /*
* Debug levels. * Debug levels.
......
net/lapb/lapb_iface.c
View file @ 457a6c8c
This diff is collapsed.
net/lapb/lapb_in.c
View file @ 457a6c8c
This diff is collapsed.
net/lapb/lapb_out.c
View file @ 457a6c8c
...@@ -38,56 +38,54 @@ ...@@ -38,56 +38,54 @@
* This procedure is passed a buffer descriptor for an iframe. It builds * This procedure is passed a buffer descriptor for an iframe. It builds
* the rest of the control part of the frame and then writes it out. * the rest of the control part of the frame and then writes it out.
*/ */
static void lapb_send_iframe(lapb_cb *lapb, struct sk_buff *skb, int poll_bit) static void lapb_send_iframe(struct lapb_cb *lapb, struct sk_buff *skb, int poll_bit)
{ {
unsigned char *frame; unsigned char *frame;
if (skb == NULL) if (!skb)
return; return;
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
frame = skb_push(skb, 2); frame = skb_push(skb, 2);
frame[0] = LAPB_I; frame[0] = LAPB_I;
frame[0] |= (lapb->vs << 1); frame[0] |= lapb->vs << 1;
frame[1] = (poll_bit) ? LAPB_EPF : 0; frame[1] = poll_bit ? LAPB_EPF : 0;
frame[1] |= (lapb->vr << 1); frame[1] |= lapb->vr << 1;
} else { } else {
frame = skb_push(skb, 1); frame = skb_push(skb, 1);
*frame = LAPB_I; *frame = LAPB_I;
*frame |= (poll_bit) ? LAPB_SPF : 0; *frame |= poll_bit ? LAPB_SPF : 0;
*frame |= (lapb->vr << 5); *frame |= lapb->vr << 5;
*frame |= (lapb->vs << 1); *frame |= lapb->vs << 1;
} }
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n", lapb->token, lapb->state, poll_bit, lapb->vs, lapb->vr); printk(KERN_DEBUG "lapb: (%p) S%d TX I(%d) S%d R%d\n",
lapb->token, lapb->state, poll_bit, lapb->vs, lapb->vr);
#endif #endif
lapb_transmit_buffer(lapb, skb, LAPB_COMMAND); lapb_transmit_buffer(lapb, skb, LAPB_COMMAND);
} }
void lapb_kick(lapb_cb *lapb) void lapb_kick(struct lapb_cb *lapb)
{ {
struct sk_buff *skb, *skbn; struct sk_buff *skb, *skbn;
unsigned short modulus, start, end; unsigned short modulus, start, end;
modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS; modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS;
start = !skb_peek(&lapb->ack_queue) ? lapb->va : lapb->vs;
start = (skb_peek(&lapb->ack_queue) == NULL) ? lapb->va : lapb->vs;
end = (lapb->va + lapb->window) % modulus; end = (lapb->va + lapb->window) % modulus;
if (!(lapb->condition & LAPB_PEER_RX_BUSY_CONDITION) && if (!(lapb->condition & LAPB_PEER_RX_BUSY_CONDITION) &&
start != end && start != end && skb_peek(&lapb->write_queue)) {
skb_peek(&lapb->write_queue) != NULL) {
lapb->vs = start; lapb->vs = start;
/* /*
* Dequeue the frame and copy it. * Dequeue the frame and copy it.
*/ */
skb = skb_dequeue(&lapb->write_queue); skb = skb_dequeue(&lapb->write_queue);
do { do {
if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) { if ((skbn = skb_clone(skb, GFP_ATOMIC)) == NULL) {
...@@ -95,7 +93,7 @@ void lapb_kick(lapb_cb *lapb) ...@@ -95,7 +93,7 @@ void lapb_kick(lapb_cb *lapb)
break; break;
} }
if (skb->sk != NULL) if (skb->sk)
skb_set_owner_w(skbn, skb->sk); skb_set_owner_w(skbn, skb->sk);
/* /*
...@@ -119,7 +117,7 @@ void lapb_kick(lapb_cb *lapb) ...@@ -119,7 +117,7 @@ void lapb_kick(lapb_cb *lapb)
} }
} }
void lapb_transmit_buffer(lapb_cb *lapb, struct sk_buff *skb, int type) void lapb_transmit_buffer(struct lapb_cb *lapb, struct sk_buff *skb, int type)
{ {
unsigned char *ptr; unsigned char *ptr;
...@@ -152,26 +150,30 @@ void lapb_transmit_buffer(lapb_cb *lapb, struct sk_buff *skb, int type) ...@@ -152,26 +150,30 @@ void lapb_transmit_buffer(lapb_cb *lapb, struct sk_buff *skb, int type)
} }
#if LAPB_DEBUG > 2 #if LAPB_DEBUG > 2
printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n", lapb->token, lapb->state, skb->data[0], skb->data[1], skb->data[2]); printk(KERN_DEBUG "lapb: (%p) S%d TX %02X %02X %02X\n",
lapb->token, lapb->state,
skb->data[0], skb->data[1], skb->data[2]);
#endif #endif
if (!lapb_data_transmit(lapb, skb)) if (!lapb_data_transmit(lapb, skb))
kfree_skb(skb); kfree_skb(skb);
} }
void lapb_establish_data_link(lapb_cb *lapb) void lapb_establish_data_link(struct lapb_cb *lapb)
{ {
lapb->condition = 0x00; lapb->condition = 0x00;
lapb->n2count = 0; lapb->n2count = 0;
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n", lapb->token, lapb->state); printk(KERN_DEBUG "lapb: (%p) S%d TX SABME(1)\n",
lapb->token, lapb->state);
#endif #endif
lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABME, LAPB_POLLON, LAPB_COMMAND);
} else { } else {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n", lapb->token, lapb->state); printk(KERN_DEBUG "lapb: (%p) S%d TX SABM(1)\n",
lapb->token, lapb->state);
#endif #endif
lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND); lapb_send_control(lapb, LAPB_SABM, LAPB_POLLON, LAPB_COMMAND);
} }
...@@ -180,10 +182,11 @@ void lapb_establish_data_link(lapb_cb *lapb) ...@@ -180,10 +182,11 @@ void lapb_establish_data_link(lapb_cb *lapb)
lapb_stop_t2timer(lapb); lapb_stop_t2timer(lapb);
} }
void lapb_enquiry_response(lapb_cb *lapb) void lapb_enquiry_response(struct lapb_cb *lapb)
{ {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n", lapb->token, lapb->state, lapb->vr); printk(KERN_DEBUG "lapb: (%p) S%d TX RR(1) R%d\n",
lapb->token, lapb->state, lapb->vr);
#endif #endif
lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE); lapb_send_control(lapb, LAPB_RR, LAPB_POLLON, LAPB_RESPONSE);
...@@ -191,32 +194,30 @@ void lapb_enquiry_response(lapb_cb *lapb) ...@@ -191,32 +194,30 @@ void lapb_enquiry_response(lapb_cb *lapb)
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION; lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
} }
void lapb_timeout_response(lapb_cb *lapb) void lapb_timeout_response(struct lapb_cb *lapb)
{ {
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n", lapb->token, lapb->state, lapb->vr); printk(KERN_DEBUG "lapb: (%p) S%d TX RR(0) R%d\n",
lapb->token, lapb->state, lapb->vr);
#endif #endif
lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE); lapb_send_control(lapb, LAPB_RR, LAPB_POLLOFF, LAPB_RESPONSE);
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION; lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
} }
void lapb_check_iframes_acked(lapb_cb *lapb, unsigned short nr) void lapb_check_iframes_acked(struct lapb_cb *lapb, unsigned short nr)
{ {
if (lapb->vs == nr) { if (lapb->vs == nr) {
lapb_frames_acked(lapb, nr); lapb_frames_acked(lapb, nr);
lapb_stop_t1timer(lapb); lapb_stop_t1timer(lapb);
lapb->n2count = 0; lapb->n2count = 0;
} else { } else if (lapb->va != nr) {
if (lapb->va != nr) { lapb_frames_acked(lapb, nr);
lapb_frames_acked(lapb, nr); lapb_start_t1timer(lapb);
lapb_start_t1timer(lapb);
}
} }
} }
void lapb_check_need_response(lapb_cb *lapb, int type, int pf) void lapb_check_need_response(struct lapb_cb *lapb, int type, int pf)
{ {
if (type == LAPB_COMMAND && pf) if (type == LAPB_COMMAND && pf)
lapb_enquiry_response(lapb); lapb_enquiry_response(lapb);
......
net/lapb/lapb_subr.c
View file @ 457a6c8c
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/* /*
* This routine purges all the queues of frames. * This routine purges all the queues of frames.
*/ */
void lapb_clear_queues(lapb_cb *lapb) void lapb_clear_queues(struct lapb_cb *lapb)
{ {
skb_queue_purge(&lapb->write_queue); skb_queue_purge(&lapb->write_queue);
skb_queue_purge(&lapb->ack_queue); skb_queue_purge(&lapb->ack_queue);
...@@ -47,7 +47,7 @@ void lapb_clear_queues(lapb_cb *lapb) ...@@ -47,7 +47,7 @@ void lapb_clear_queues(lapb_cb *lapb)
* acknowledged. This replaces the boxes labelled "V(a) <- N(r)" on the * acknowledged. This replaces the boxes labelled "V(a) <- N(r)" on the
* SDL diagram. * SDL diagram.
*/ */
void lapb_frames_acked(lapb_cb *lapb, unsigned short nr) void lapb_frames_acked(struct lapb_cb *lapb, unsigned short nr)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int modulus; int modulus;
...@@ -57,16 +57,15 @@ void lapb_frames_acked(lapb_cb *lapb, unsigned short nr) ...@@ -57,16 +57,15 @@ void lapb_frames_acked(lapb_cb *lapb, unsigned short nr)
/* /*
* Remove all the ack-ed frames from the ack queue. * Remove all the ack-ed frames from the ack queue.
*/ */
if (lapb->va != nr) { if (lapb->va != nr)
while (skb_peek(&lapb->ack_queue) != NULL && lapb->va != nr) { while (skb_peek(&lapb->ack_queue) && lapb->va != nr) {
skb = skb_dequeue(&lapb->ack_queue); skb = skb_dequeue(&lapb->ack_queue);
kfree_skb(skb); kfree_skb(skb);
lapb->va = (lapb->va + 1) % modulus; lapb->va = (lapb->va + 1) % modulus;
} }
}
} }
void lapb_requeue_frames(lapb_cb *lapb) void lapb_requeue_frames(struct lapb_cb *lapb)
{ {
struct sk_buff *skb, *skb_prev = NULL; struct sk_buff *skb, *skb_prev = NULL;
...@@ -76,7 +75,7 @@ void lapb_requeue_frames(lapb_cb *lapb) ...@@ -76,7 +75,7 @@ void lapb_requeue_frames(lapb_cb *lapb)
* possibility of an empty output queue. * possibility of an empty output queue.
*/ */
while ((skb = skb_dequeue(&lapb->ack_queue)) != NULL) { while ((skb = skb_dequeue(&lapb->ack_queue)) != NULL) {
if (skb_prev == NULL) if (!skb_prev)
skb_queue_head(&lapb->write_queue, skb); skb_queue_head(&lapb->write_queue, skb);
else else
skb_append(skb_prev, skb); skb_append(skb_prev, skb);
...@@ -88,7 +87,7 @@ void lapb_requeue_frames(lapb_cb *lapb) ...@@ -88,7 +87,7 @@ void lapb_requeue_frames(lapb_cb *lapb)
* Validate that the value of nr is between va and vs. Return true or * Validate that the value of nr is between va and vs. Return true or
* false for testing. * false for testing.
*/ */
int lapb_validate_nr(lapb_cb *lapb, unsigned short nr) int lapb_validate_nr(struct lapb_cb *lapb, unsigned short nr)
{ {
unsigned short vc = lapb->va; unsigned short vc = lapb->va;
int modulus; int modulus;
...@@ -96,25 +95,27 @@ int lapb_validate_nr(lapb_cb *lapb, unsigned short nr) ...@@ -96,25 +95,27 @@ int lapb_validate_nr(lapb_cb *lapb, unsigned short nr)
modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS; modulus = (lapb->mode & LAPB_EXTENDED) ? LAPB_EMODULUS : LAPB_SMODULUS;
while (vc != lapb->vs) { while (vc != lapb->vs) {
if (nr == vc) return 1; if (nr == vc)
return 1;
vc = (vc + 1) % modulus; vc = (vc + 1) % modulus;
} }
if (nr == lapb->vs) return 1; return nr == lapb->vs;
return 0;
} }
/* /*
* This routine is the centralised routine for parsing the control * This routine is the centralised routine for parsing the control
* information for the different frame formats. * information for the different frame formats.
*/ */
void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame) void lapb_decode(struct lapb_cb *lapb, struct sk_buff *skb,
struct lapb_frame *frame)
{ {
frame->type = LAPB_ILLEGAL; frame->type = LAPB_ILLEGAL;
#if LAPB_DEBUG > 2 #if LAPB_DEBUG > 2
printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n", lapb->token, lapb->state, skb->data[0], skb->data[1], skb->data[2]); printk(KERN_DEBUG "lapb: (%p) S%d RX %02X %02X %02X\n",
lapb->token, lapb->state,
skb->data[0], skb->data[1], skb->data[2]);
#endif #endif
if (lapb->mode & LAPB_MLP) { if (lapb->mode & LAPB_MLP) {
...@@ -146,22 +147,31 @@ void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame) ...@@ -146,22 +147,31 @@ void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame)
skb_pull(skb, 1); skb_pull(skb, 1);
if (lapb->mode & LAPB_EXTENDED) { if (lapb->mode & LAPB_EXTENDED) {
if ((skb->data[0] & LAPB_S) == 0) { if (!(skb->data[0] & LAPB_S)) {
frame->type = LAPB_I; /* I frame - carries NR/NS/PF */ /*
* I frame - carries NR/NS/PF
*/
frame->type = LAPB_I;
frame->ns = (skb->data[0] >> 1) & 0x7F; frame->ns = (skb->data[0] >> 1) & 0x7F;
frame->nr = (skb->data[1] >> 1) & 0x7F; frame->nr = (skb->data[1] >> 1) & 0x7F;
frame->pf = skb->data[1] & LAPB_EPF; frame->pf = skb->data[1] & LAPB_EPF;
frame->control[0] = skb->data[0]; frame->control[0] = skb->data[0];
frame->control[1] = skb->data[1]; frame->control[1] = skb->data[1];
skb_pull(skb, 2); skb_pull(skb, 2);
} else if ((skb->data[0] & LAPB_U) == 1) { /* S frame - take out PF/NR */ } else if ((skb->data[0] & LAPB_U) == 1) {
/*
* S frame - take out PF/NR
*/
frame->type = skb->data[0] & 0x0F; frame->type = skb->data[0] & 0x0F;
frame->nr = (skb->data[1] >> 1) & 0x7F; frame->nr = (skb->data[1] >> 1) & 0x7F;
frame->pf = skb->data[1] & LAPB_EPF; frame->pf = skb->data[1] & LAPB_EPF;
frame->control[0] = skb->data[0]; frame->control[0] = skb->data[0];
frame->control[1] = skb->data[1]; frame->control[1] = skb->data[1];
skb_pull(skb, 2); skb_pull(skb, 2);
} else if ((skb->data[0] & LAPB_U) == 3) { /* U frame - take out PF */ } else if ((skb->data[0] & LAPB_U) == 3) {
/*
* U frame - take out PF
*/
frame->type = skb->data[0] & ~LAPB_SPF; frame->type = skb->data[0] & ~LAPB_SPF;
frame->pf = skb->data[0] & LAPB_SPF; frame->pf = skb->data[0] & LAPB_SPF;
frame->control[0] = skb->data[0]; frame->control[0] = skb->data[0];
...@@ -169,16 +179,25 @@ void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame) ...@@ -169,16 +179,25 @@ void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame)
skb_pull(skb, 1); skb_pull(skb, 1);
} }
} else { } else {
if ((skb->data[0] & LAPB_S) == 0) { if (!(skb->data[0] & LAPB_S)) {
frame->type = LAPB_I; /* I frame - carries NR/NS/PF */ /*
* I frame - carries NR/NS/PF
*/
frame->type = LAPB_I;
frame->ns = (skb->data[0] >> 1) & 0x07; frame->ns = (skb->data[0] >> 1) & 0x07;
frame->nr = (skb->data[0] >> 5) & 0x07; frame->nr = (skb->data[0] >> 5) & 0x07;
frame->pf = skb->data[0] & LAPB_SPF; frame->pf = skb->data[0] & LAPB_SPF;
} else if ((skb->data[0] & LAPB_U) == 1) { /* S frame - take out PF/NR */ } else if ((skb->data[0] & LAPB_U) == 1) {
/*
* S frame - take out PF/NR
*/
frame->type = skb->data[0] & 0x0F; frame->type = skb->data[0] & 0x0F;
frame->nr = (skb->data[0] >> 5) & 0x07; frame->nr = (skb->data[0] >> 5) & 0x07;
frame->pf = skb->data[0] & LAPB_SPF; frame->pf = skb->data[0] & LAPB_SPF;
} else if ((skb->data[0] & LAPB_U) == 3) { /* U frame - take out PF */ } else if ((skb->data[0] & LAPB_U) == 3) {
/*
* U frame - take out PF
*/
frame->type = skb->data[0] & ~LAPB_SPF; frame->type = skb->data[0] & ~LAPB_SPF;
frame->pf = skb->data[0] & LAPB_SPF; frame->pf = skb->data[0] & LAPB_SPF;
} }
...@@ -195,7 +214,8 @@ void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame) ...@@ -195,7 +214,8 @@ void lapb_decode(lapb_cb *lapb, struct sk_buff *skb, struct lapb_frame *frame)
* Only supervisory or unnumbered frames are processed, FRMRs are handled * Only supervisory or unnumbered frames are processed, FRMRs are handled
* by lapb_transmit_frmr below. * by lapb_transmit_frmr below.
*/ */
void lapb_send_control(lapb_cb *lapb, int frametype, int poll_bit, int type) void lapb_send_control(struct lapb_cb *lapb, int frametype,
int poll_bit, int type)
{ {
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *dptr; unsigned char *dptr;
...@@ -209,18 +229,18 @@ void lapb_send_control(lapb_cb *lapb, int frametype, int poll_bit, int type) ...@@ -209,18 +229,18 @@ void lapb_send_control(lapb_cb *lapb, int frametype, int poll_bit, int type)
if ((frametype & LAPB_U) == LAPB_U) { if ((frametype & LAPB_U) == LAPB_U) {
dptr = skb_put(skb, 1); dptr = skb_put(skb, 1);
*dptr = frametype; *dptr = frametype;
*dptr |= (poll_bit) ? LAPB_SPF : 0; *dptr |= poll_bit ? LAPB_SPF : 0;
} else { } else {
dptr = skb_put(skb, 2); dptr = skb_put(skb, 2);
dptr[0] = frametype; dptr[0] = frametype;
dptr[1] = (lapb->vr << 1); dptr[1] = (lapb->vr << 1);
dptr[1] |= (poll_bit) ? LAPB_EPF : 0; dptr[1] |= poll_bit ? LAPB_EPF : 0;
} }
} else { } else {
dptr = skb_put(skb, 1); dptr = skb_put(skb, 1);
*dptr = frametype; *dptr = frametype;
*dptr |= (poll_bit) ? LAPB_SPF : 0; *dptr |= poll_bit ? LAPB_SPF : 0;
if ((frametype & LAPB_U) == LAPB_S) /* S frames carry NR */ if ((frametype & LAPB_U) == LAPB_S) /* S frames carry NR */
*dptr |= (lapb->vr << 5); *dptr |= (lapb->vr << 5);
} }
...@@ -231,7 +251,7 @@ void lapb_send_control(lapb_cb *lapb, int frametype, int poll_bit, int type) ...@@ -231,7 +251,7 @@ void lapb_send_control(lapb_cb *lapb, int frametype, int poll_bit, int type)
* This routine generates FRMRs based on information previously stored in * This routine generates FRMRs based on information previously stored in
* the LAPB control block. * the LAPB control block.
*/ */
void lapb_transmit_frmr(lapb_cb *lapb) void lapb_transmit_frmr(struct lapb_cb *lapb)
{ {
struct sk_buff *skb; struct sk_buff *skb;
unsigned char *dptr; unsigned char *dptr;
...@@ -254,7 +274,10 @@ void lapb_transmit_frmr(lapb_cb *lapb) ...@@ -254,7 +274,10 @@ void lapb_transmit_frmr(lapb_cb *lapb)
*dptr++ = lapb->frmr_type; *dptr++ = lapb->frmr_type;
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n", lapb->token, lapb->state, skb->data[1], skb->data[2], skb->data[3], skb->data[4], skb->data[5]); printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X %02X %02X\n",
lapb->token, lapb->state,
skb->data[1], skb->data[2], skb->data[3],
skb->data[4], skb->data[5]);
#endif #endif
} else { } else {
dptr = skb_put(skb, 4); dptr = skb_put(skb, 4);
...@@ -268,7 +291,9 @@ void lapb_transmit_frmr(lapb_cb *lapb) ...@@ -268,7 +291,9 @@ void lapb_transmit_frmr(lapb_cb *lapb)
*dptr++ = lapb->frmr_type; *dptr++ = lapb->frmr_type;
#if LAPB_DEBUG > 1 #if LAPB_DEBUG > 1
printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n", lapb->token, lapb->state, skb->data[1], skb->data[2], skb->data[3]); printk(KERN_DEBUG "lapb: (%p) S%d TX FRMR %02X %02X %02X\n",
lapb->token, lapb->state, skb->data[1],
skb->data[2], skb->data[3]);
#endif #endif
} }
......
net/lapb/lapb_timer.c
View file @ 457a6c8c
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
static void lapb_t1timer_expiry(unsigned long); static void lapb_t1timer_expiry(unsigned long);
static void lapb_t2timer_expiry(unsigned long); static void lapb_t2timer_expiry(unsigned long);
void lapb_start_t1timer(lapb_cb *lapb) void lapb_start_t1timer(struct lapb_cb *lapb)
{ {
del_timer(&lapb->t1timer); del_timer(&lapb->t1timer);
...@@ -48,7 +48,7 @@ void lapb_start_t1timer(lapb_cb *lapb) ...@@ -48,7 +48,7 @@ void lapb_start_t1timer(lapb_cb *lapb)
add_timer(&lapb->t1timer); add_timer(&lapb->t1timer);
} }
void lapb_start_t2timer(lapb_cb *lapb) void lapb_start_t2timer(struct lapb_cb *lapb)
{ {
del_timer(&lapb->t2timer); del_timer(&lapb->t2timer);
...@@ -59,24 +59,24 @@ void lapb_start_t2timer(lapb_cb *lapb) ...@@ -59,24 +59,24 @@ void lapb_start_t2timer(lapb_cb *lapb)
add_timer(&lapb->t2timer); add_timer(&lapb->t2timer);
} }
void lapb_stop_t1timer(lapb_cb *lapb) void lapb_stop_t1timer(struct lapb_cb *lapb)
{ {
del_timer(&lapb->t1timer); del_timer(&lapb->t1timer);
} }
void lapb_stop_t2timer(lapb_cb *lapb) void lapb_stop_t2timer(struct lapb_cb *lapb)
{ {
del_timer(&lapb->t2timer); del_timer(&lapb->t2timer);
} }
int lapb_t1timer_running(lapb_cb *lapb) int lapb_t1timer_running(struct lapb_cb *lapb)
{ {
return timer_pending(&lapb->t1timer); return timer_pending(&lapb->t1timer);
} }
static void lapb_t2timer_expiry(unsigned long param) static void lapb_t2timer_expiry(unsigned long param)
{ {
lapb_cb *lapb = (lapb_cb *)param; struct lapb_cb *lapb = (struct lapb_cb *)param;
if (lapb->condition & LAPB_ACK_PENDING_CONDITION) { if (lapb->condition & LAPB_ACK_PENDING_CONDITION) {
lapb->condition &= ~LAPB_ACK_PENDING_CONDITION; lapb->condition &= ~LAPB_ACK_PENDING_CONDITION;
...@@ -86,7 +86,7 @@ static void lapb_t2timer_expiry(unsigned long param) ...@@ -86,7 +86,7 @@ static void lapb_t2timer_expiry(unsigned long param)
static void lapb_t1timer_expiry(unsigned long param) static void lapb_t1timer_expiry(unsigned long param)
{ {
lapb_cb *lapb = (lapb_cb *)param; struct lapb_cb *lapb = (struct lapb_cb *)param;
switch (lapb->state) { switch (lapb->state) {
......
net/x25/af_x25.c
View file @ 457a6c8c
...@@ -65,7 +65,8 @@ int sysctl_x25_reset_request_timeout = X25_DEFAULT_T22; ...@@ -65,7 +65,8 @@ int sysctl_x25_reset_request_timeout = X25_DEFAULT_T22;
int sysctl_x25_clear_request_timeout = X25_DEFAULT_T23; int sysctl_x25_clear_request_timeout = X25_DEFAULT_T23;
int sysctl_x25_ack_holdback_timeout = X25_DEFAULT_T2; int sysctl_x25_ack_holdback_timeout = X25_DEFAULT_T2;
static struct sock *volatile x25_list /* = NULL initially */; static struct sock *x25_list;
static rwlock_t x25_list_lock = RW_LOCK_UNLOCKED;
static struct proto_ops x25_proto_ops; static struct proto_ops x25_proto_ops;
...@@ -152,22 +153,22 @@ int x25_addr_aton(unsigned char *p, struct x25_address *called_addr, ...@@ -152,22 +153,22 @@ int x25_addr_aton(unsigned char *p, struct x25_address *called_addr,
static void x25_remove_socket(struct sock *sk) static void x25_remove_socket(struct sock *sk)
{ {
struct sock *s; struct sock *s;
unsigned long flags;
save_flags(flags); write_lock_bh(&x25_list_lock);
cli();
if ((s = x25_list) == sk) if ((s = x25_list) == sk)
x25_list = s->next; x25_list = s->next;
else while (s && s->next) { else while (s && s->next) {
if (s->next == sk) { if (s->next == sk) {
s->next = sk->next; s->next = sk->next;
sock_put(sk);
break; break;
} }
s = s->next; s = s->next;
} }
restore_flags(flags);
write_unlock_bh(&x25_list_lock);
} }
/* /*
...@@ -177,15 +178,20 @@ static void x25_kill_by_device(struct net_device *dev) ...@@ -177,15 +178,20 @@ static void x25_kill_by_device(struct net_device *dev)
{ {
struct sock *s; struct sock *s;
write_lock_bh(&x25_list_lock);
for (s = x25_list; s; s = s->next) for (s = x25_list; s; s = s->next)
if (x25_sk(s)->neighbour && x25_sk(s)->neighbour->dev == dev) if (x25_sk(s)->neighbour && x25_sk(s)->neighbour->dev == dev)
x25_disconnect(s, ENETUNREACH, 0, 0); x25_disconnect(s, ENETUNREACH, 0, 0);
write_unlock_bh(&x25_list_lock);
} }
/* /*
* Handle device status changes. * Handle device status changes.
*/ */
static int x25_device_event(struct notifier_block *this, unsigned long event, void *ptr) static int x25_device_event(struct notifier_block *this, unsigned long event,
void *ptr)
{ {
struct net_device *dev = ptr; struct net_device *dev = ptr;
struct x25_neigh *nb; struct x25_neigh *nb;
...@@ -222,15 +228,11 @@ static int x25_device_event(struct notifier_block *this, unsigned long event, vo ...@@ -222,15 +228,11 @@ static int x25_device_event(struct notifier_block *this, unsigned long event, vo
*/ */
static void x25_insert_socket(struct sock *sk) static void x25_insert_socket(struct sock *sk)
{ {
unsigned long flags; write_lock_bh(&x25_list_lock);
save_flags(flags);
cli();
sk->next = x25_list; sk->next = x25_list;
x25_list = sk; x25_list = sk;
sock_hold(sk);
restore_flags(flags); write_unlock_bh(&x25_list_lock);
} }
/* /*
...@@ -239,11 +241,9 @@ static void x25_insert_socket(struct sock *sk) ...@@ -239,11 +241,9 @@ static void x25_insert_socket(struct sock *sk)
*/ */
static struct sock *x25_find_listener(struct x25_address *addr) static struct sock *x25_find_listener(struct x25_address *addr)
{ {
unsigned long flags;
struct sock *s; struct sock *s;
save_flags(flags); read_lock_bh(&x25_list_lock);
cli();
for (s = x25_list; s; s = s->next) for (s = x25_list; s; s = s->next)
if ((!strcmp(addr->x25_addr, x25_sk(s)->source_addr.x25_addr) || if ((!strcmp(addr->x25_addr, x25_sk(s)->source_addr.x25_addr) ||
...@@ -251,26 +251,34 @@ static struct sock *x25_find_listener(struct x25_address *addr) ...@@ -251,26 +251,34 @@ static struct sock *x25_find_listener(struct x25_address *addr)
s->state == TCP_LISTEN) s->state == TCP_LISTEN)
break; break;
restore_flags(flags); if (s)
sock_hold(s);
read_unlock_bh(&x25_list_lock);
return s; return s;
} }
/* /*
* Find a connected X.25 socket given my LCI and neighbour. * Find a connected X.25 socket given my LCI and neighbour.
*/ */
struct sock *x25_find_socket(unsigned int lci, struct x25_neigh *nb) struct sock *__x25_find_socket(unsigned int lci, struct x25_neigh *nb)
{ {
struct sock *s; struct sock *s;
unsigned long flags;
save_flags(flags);
cli();
for (s = x25_list; s; s = s->next) for (s = x25_list; s; s = s->next)
if (x25_sk(s)->lci == lci && x25_sk(s)->neighbour == nb) if (x25_sk(s)->lci == lci && x25_sk(s)->neighbour == nb)
break; break;
if (s)
sock_hold(s);
return s;
}
struct sock *x25_find_socket(unsigned int lci, struct x25_neigh *nb)
{
struct sock *s;
restore_flags(flags); read_lock_bh(&x25_list_lock);
s = __x25_find_socket(lci, nb);
read_unlock_bh(&x25_list_lock);
return s; return s;
} }
...@@ -280,13 +288,19 @@ struct sock *x25_find_socket(unsigned int lci, struct x25_neigh *nb) ...@@ -280,13 +288,19 @@ struct sock *x25_find_socket(unsigned int lci, struct x25_neigh *nb)
unsigned int x25_new_lci(struct x25_neigh *nb) unsigned int x25_new_lci(struct x25_neigh *nb)
{ {
unsigned int lci = 1; unsigned int lci = 1;
struct sock *sk;
read_lock_bh(&x25_list_lock);
while (x25_find_socket(lci, nb)) while ((sk = __x25_find_socket(lci, nb)) != NULL) {
sock_put(sk);
if (++lci == 4096) { if (++lci == 4096) {
lci = 0; lci = 0;
break; break;
} }
}
read_unlock_bh(&x25_list_lock);
return lci; return lci;
} }
...@@ -312,11 +326,9 @@ static void x25_destroy_timer(unsigned long data) ...@@ -312,11 +326,9 @@ static void x25_destroy_timer(unsigned long data)
void x25_destroy_socket(struct sock *sk) /* Not static as it's used by the timer */ void x25_destroy_socket(struct sock *sk) /* Not static as it's used by the timer */
{ {
struct sk_buff *skb; struct sk_buff *skb;
unsigned long flags;
save_flags(flags);
cli();
sock_hold(sk);
lock_sock(sk);
x25_stop_heartbeat(sk); x25_stop_heartbeat(sk);
x25_stop_timer(sk); x25_stop_timer(sk);
...@@ -344,8 +356,8 @@ void x25_destroy_socket(struct sock *sk) /* Not static as it's used by the timer ...@@ -344,8 +356,8 @@ void x25_destroy_socket(struct sock *sk) /* Not static as it's used by the timer
sk_free(sk); sk_free(sk);
MOD_DEC_USE_COUNT; MOD_DEC_USE_COUNT;
} }
release_sock(sk);
restore_flags(flags); sock_put(sk);
} }
/* /*
...@@ -590,6 +602,35 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len) ...@@ -590,6 +602,35 @@ static int x25_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
return 0; return 0;
} }
static int x25_wait_for_connection_establishment(struct sock *sk)
{
DECLARE_WAITQUEUE(wait, current);
int rc;
add_wait_queue_exclusive(sk->sleep, &wait);
for (;;) {
__set_current_state(TASK_INTERRUPTIBLE);
rc = -ERESTARTSYS;
if (signal_pending(current))
break;
rc = sock_error(sk);
if (rc) {
sk->socket->state = SS_UNCONNECTED;
break;
}
rc = 0;
if (sk->state != TCP_ESTABLISHED) {
release_sock(sk);
schedule();
lock_sock(sk);
} else
break;
}
__set_current_state(TASK_RUNNING);
remove_wait_queue(sk->sleep, &wait);
return rc;
}
static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags) static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len, int flags)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -598,6 +639,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len ...@@ -598,6 +639,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len
struct x25_route *rt; struct x25_route *rt;
int rc = 0; int rc = 0;
lock_sock(sk);
if (sk->state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) { if (sk->state == TCP_ESTABLISHED && sock->state == SS_CONNECTING) {
sock->state = SS_CONNECTED; sock->state = SS_CONNECTED;
goto out; /* Connect completed during a ERESTARTSYS event */ goto out; /* Connect completed during a ERESTARTSYS event */
...@@ -661,35 +703,48 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len ...@@ -661,35 +703,48 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len
if (sk->state != TCP_ESTABLISHED && (flags & O_NONBLOCK)) if (sk->state != TCP_ESTABLISHED && (flags & O_NONBLOCK))
goto out_put_neigh; goto out_put_neigh;
cli(); /* To avoid races on the sleep */ rc = x25_wait_for_connection_establishment(sk);
if (rc)
/* goto out_put_neigh;
* A Clear Request or timeout or failed routing will go to closed.
*/
rc = -ERESTARTSYS;
while (sk->state == TCP_SYN_SENT) {
/* FIXME: going to sleep with interrupts disabled */
interruptible_sleep_on(sk->sleep);
if (signal_pending(current))
goto out_unlock;
}
if (sk->state != TCP_ESTABLISHED) {
sock->state = SS_UNCONNECTED;
rc = sock_error(sk); /* Always set at this point */
goto out_unlock;
}
sock->state = SS_CONNECTED; sock->state = SS_CONNECTED;
rc = 0; rc = 0;
out_unlock:
sti();
out_put_neigh: out_put_neigh:
if (rc) if (rc)
x25_neigh_put(x25->neighbour); x25_neigh_put(x25->neighbour);
out_put_route: out_put_route:
x25_route_put(rt); x25_route_put(rt);
out: out:
release_sock(sk);
return rc;
}
static int x25_wait_for_data(struct sock *sk, int timeout)
{
DECLARE_WAITQUEUE(wait, current);
int rc = 0;
add_wait_queue_exclusive(sk->sleep, &wait);
for (;;) {
__set_current_state(TASK_INTERRUPTIBLE);
if (sk->shutdown & RCV_SHUTDOWN)
break;
rc = -ERESTARTSYS;
if (signal_pending(current))
break;
rc = -EAGAIN;
if (!timeout)
break;
rc = 0;
if (skb_queue_empty(&sk->receive_queue)) {
release_sock(sk);
timeout = schedule_timeout(timeout);
lock_sock(sk);
} else
break;
}
__set_current_state(TASK_RUNNING);
remove_wait_queue(sk->sleep, &wait);
return rc; return rc;
} }
...@@ -707,29 +762,17 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -707,29 +762,17 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
if (sk->type != SOCK_SEQPACKET) if (sk->type != SOCK_SEQPACKET)
goto out; goto out;
/* rc = x25_wait_for_data(sk, sk->rcvtimeo);
* The write queue this time is holding sockets ready to use if (rc)
* hooked into the CALL INDICATION we saved goto out;
*/ skb = skb_dequeue(&sk->receive_queue);
do { rc = -EINVAL;
cli(); if (!skb->sk)
if ((skb = skb_dequeue(&sk->receive_queue)) == NULL) { goto out;
rc = -EWOULDBLOCK;
if (flags & O_NONBLOCK)
goto out_unlock;
/* FIXME: going to sleep with interrupts disabled */
interruptible_sleep_on(sk->sleep);
rc = -ERESTARTSYS;
if (signal_pending(current))
goto out_unlock;
}
} while (!skb);
newsk = skb->sk; newsk = skb->sk;
newsk->pair = NULL; newsk->pair = NULL;
newsk->socket = newsock; newsk->socket = newsock;
newsk->sleep = &newsock->wait; newsk->sleep = &newsock->wait;
sti();
/* Now attach up the new socket */ /* Now attach up the new socket */
skb->sk = NULL; skb->sk = NULL;
...@@ -740,9 +783,6 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags) ...@@ -740,9 +783,6 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags)
rc = 0; rc = 0;
out: out:
return rc; return rc;
out_unlock:
sti();
goto out;
} }
static int x25_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer) static int x25_getname(struct socket *sock, struct sockaddr *uaddr, int *uaddr_len, int peer)
...@@ -799,7 +839,7 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int ...@@ -799,7 +839,7 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int
* Try to reach a compromise on the requested facilities. * Try to reach a compromise on the requested facilities.
*/ */
if ((len = x25_negotiate_facilities(skb, sk, &facilities)) == -1) if ((len = x25_negotiate_facilities(skb, sk, &facilities)) == -1)
goto out_clear_request; goto out_sock_put;
/* /*
* current neighbour/link might impose additional limits * current neighbour/link might impose additional limits
...@@ -813,7 +853,7 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int ...@@ -813,7 +853,7 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int
*/ */
make = x25_make_new(sk); make = x25_make_new(sk);
if (!make) if (!make)
goto out_clear_request; goto out_sock_put;
/* /*
* Remove the facilities, leaving any Call User Data. * Remove the facilities, leaving any Call User Data.
...@@ -855,8 +895,11 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int ...@@ -855,8 +895,11 @@ int x25_rx_call_request(struct sk_buff *skb, struct x25_neigh *nb, unsigned int
if (!sk->dead) if (!sk->dead)
sk->data_ready(sk, skb->len); sk->data_ready(sk, skb->len);
rc = 1; rc = 1;
sock_put(sk);
out: out:
return rc; return rc;
out_sock_put:
sock_put(sk);
out_clear_request: out_clear_request:
rc = 0; rc = 0;
x25_transmit_clear_request(nb, lci, 0x01); x25_transmit_clear_request(nb, lci, 0x01);
...@@ -1264,14 +1307,12 @@ static int x25_get_info(char *buffer, char **start, off_t offset, int length) ...@@ -1264,14 +1307,12 @@ static int x25_get_info(char *buffer, char **start, off_t offset, int length)
struct sock *s; struct sock *s;
struct net_device *dev; struct net_device *dev;
const char *devname; const char *devname;
int len;
off_t pos = 0; off_t pos = 0;
off_t begin = 0; off_t begin = 0;
int len = sprintf(buffer, "dest_addr src_addr dev lci st vs vr "
"va t t2 t21 t22 t23 Snd-Q Rcv-Q inode\n");
cli(); read_lock_bh(&x25_list_lock);
len = sprintf(buffer, "dest_addr src_addr dev lci st vs vr va "
"t t2 t21 t22 t23 Snd-Q Rcv-Q inode\n");
for (s = x25_list; s; s = s->next) { for (s = x25_list; s; s = s->next) {
struct x25_opt *x25 = x25_sk(s); struct x25_opt *x25 = x25_sk(s);
...@@ -1314,7 +1355,7 @@ static int x25_get_info(char *buffer, char **start, off_t offset, int length) ...@@ -1314,7 +1355,7 @@ static int x25_get_info(char *buffer, char **start, off_t offset, int length)
break; break;
} }
sti(); read_unlock_bh(&x25_list_lock);
*start = buffer + (offset - begin); *start = buffer + (offset - begin);
len -= (offset - begin); len -= (offset - begin);
...@@ -1368,9 +1409,13 @@ void x25_kill_by_neigh(struct x25_neigh *nb) ...@@ -1368,9 +1409,13 @@ void x25_kill_by_neigh(struct x25_neigh *nb)
{ {
struct sock *s; struct sock *s;
write_lock_bh(&x25_list_lock);
for (s = x25_list; s; s = s->next) for (s = x25_list; s; s = s->next)
if (x25_sk(s)->neighbour == nb) if (x25_sk(s)->neighbour == nb)
x25_disconnect(s, ENETUNREACH, 0, 0); x25_disconnect(s, ENETUNREACH, 0, 0);
write_unlock_bh(&x25_list_lock);
} }
static int __init x25_init(void) static int __init x25_init(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7