X25: Move interrupt flag to bitfield
Subsystems (3)
PATCH 2/4 X25: Move interrupt flag to bitfield
Moves the x25 interrupt flag from char into bitfield.
Signed-off-by Andrew Hendry <[email protected]>
--- include/net/x25.h | 3 ++- net/x25/af_x25.c | 1 + net/x25/x25_in.c | 2 +- net/x25/x25_out.c | 5 +++-- 4 files changed, 7 insertions(+), 4 deletions(-)
include/net/x25.h +2 -1
@@ -115,6 +115,7 @@ enum {/* Bitset in x25_sock->flags for misc flags */ #define X25_Q_BIT_FLAG 0 +#define X25_INTERRUPT_FLAG 1/** * struct x25_route - x25 routing entry
@@ -149,7 +150,7 @@ struct x25_sock {struct x25_address source_addr, dest_addr;struct x25_neigh *neighbour;unsigned int lci, cudmatchlength; -unsigned char state, condition, intflag, accptapprv; +unsigned char state, condition, accptapprv;unsigned short vs, vr, va, vl;unsigned long t2, t21, t22, t23;unsigned short fraglen;
net/x25/af_x25.c +1 -0
@@ -641,6 +641,7 @@ static struct sock *x25_make_new(struct sock *osk) x25->cudmatchlength = ox25->cudmatchlength; x25->accptapprv = ox25->accptapprv; +clear_bit (X25_INTERRUPT_FLAG , &x25->flags);x25_init_timers (sk); out:return sk;
net/x25/x25_in.c +1 -1
@@ -273,7 +273,7 @@ static int x25_state3_machine(struct sock *sk, struct sk_buff *skb, int frametypbreak ;case X25_INTERRUPT_CONFIRMATION : - x25->intflag =0 ; +clear_bit (X25_INTERRUPT_FLAG , &x25->flags);break ;case X25_INTERRUPT :
net/x25/x25_out.c +3 -2
@@ -148,8 +148,9 @@ void x25_kick(struct sock *sk)/* * Transmit interrupt data. */ -if (!x25->intflag &&skb_peek (&x25->interrupt_out_queue) !=NULL ) { - x25->intflag =1 ; +if (skb_peek (&x25->interrupt_out_queue) !=NULL && + !test_and_set_bit (X25_INTERRUPT_FLAG , &x25->flags)) { + skb =skb_dequeue (&x25->interrupt_out_queue);x25_transmit_link (skb, x25->neighbour); }
Signature · 1 line
1.5.6.5
From: Andrew Hendry <[email protected]>
Date: Mon, 17 May 2010 19:00:02 +1000
Quoted 3 lines
Moves the x25 interrupt flag from char into bitfield.
Signed-off-by Andrew Hendry <[email protected]>
Applied.