diff options
| author | andrew hendry <andrew.hendry@gmail.com> | 2010-05-17 00:59:41 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-18 02:39:26 +0200 |
| commit | cb863ffd4a04f9f8619f52c01d472a64ccc716bd (patch) | |
| tree | c65de60a93641c36057b1e10accda36a54f64d76 /include/net/x25.h | |
| parent | bnx2x: avoid TX timeout when stopping device (diff) | |
| download | linux-cb863ffd4a04f9f8619f52c01d472a64ccc716bd.tar.xz linux-cb863ffd4a04f9f8619f52c01d472a64ccc716bd.zip | |
X25: Move qbit flag to bitfield
Moves the X25 q bit flag from char into a bitfield to allow BKL cleanup.
Signed-off-by: Andrew Hendry <andrew.hendry@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/x25.h')
| -rw-r--r-- | include/net/x25.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index 468551ea4f1d..7b5795e1ceb2 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -113,6 +113,9 @@ enum { #define X25_MAX_AE_LEN 40 /* Max num of semi-octets in AE - OSI Nw */ #define X25_MAX_DTE_FACIL_LEN 21 /* Max length of DTE facility params */ +/* Bitset in x25_sock->flags for misc flags */ +#define X25_Q_BIT_FLAG 0 + /** * struct x25_route - x25 routing entry * @node - entry in x25_list_lock @@ -146,10 +149,11 @@ struct x25_sock { struct x25_address source_addr, dest_addr; struct x25_neigh *neighbour; unsigned int lci, cudmatchlength; - unsigned char state, condition, qbitincl, intflag, accptapprv; + unsigned char state, condition, intflag, accptapprv; unsigned short vs, vr, va, vl; unsigned long t2, t21, t22, t23; unsigned short fraglen; + unsigned long flags; struct sk_buff_head ack_queue; struct sk_buff_head fragment_queue; struct sk_buff_head interrupt_in_queue; |