summaryrefslogtreecommitdiffstats
path: root/include/net/x25.h
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-05-16 22:59:41 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-17 17:39:26 -0700
commitcb863ffd4a04f9f8619f52c01d472a64ccc716bd (patch)
treec65de60a93641c36057b1e10accda36a54f64d76 /include/net/x25.h
parentc89af1a30870e04986e2c8d24c0c765de0935f4b (diff)
downloadop-kernel-dev-cb863ffd4a04f9f8619f52c01d472a64ccc716bd.zip
op-kernel-dev-cb863ffd4a04f9f8619f52c01d472a64ccc716bd.tar.gz
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.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 468551e..7b5795e 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;
OpenPOWER on IntegriCloud