summaryrefslogtreecommitdiffstats
path: root/include/net/x25.h
diff options
context:
space:
mode:
authorandrew hendry <andrew.hendry@gmail.com>2010-05-16 23:00:27 +0000
committerDavid S. Miller <davem@davemloft.net>2010-05-17 17:39:27 -0700
commit37cda78741ecdbf45dd9b64e4c99dbdb11b47b46 (patch)
treeee213ce9347bc7434717092e600f970d919ceceb /include/net/x25.h
parentb7792e34cba641c49cd436d42fbfd2a632ff39d3 (diff)
downloadlinux-37cda78741ecdbf45dd9b64e4c99dbdb11b47b46.tar.bz2
X25: Move accept approve flag to bitfield
Moves the x25 accept approve flag from char into bitfield. 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.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/x25.h b/include/net/x25.h
index 1576e92c6cec..1479cb4a41fc 100644
--- a/include/net/x25.h
+++ b/include/net/x25.h
@@ -80,8 +80,6 @@ enum {
#define X25_DEFAULT_PACKET_SIZE X25_PS128 /* Default Packet Size */
#define X25_DEFAULT_THROUGHPUT 0x0A /* Deafult Throughput */
#define X25_DEFAULT_REVERSE 0x00 /* Default Reverse Charging */
-#define X25_DENY_ACCPT_APPRV 0x01 /* Default value */
-#define X25_ALLOW_ACCPT_APPRV 0x00 /* Control enabled */
#define X25_SMODULUS 8
#define X25_EMODULUS 128
@@ -116,6 +114,7 @@ enum {
/* Bitset in x25_sock->flags for misc flags */
#define X25_Q_BIT_FLAG 0
#define X25_INTERRUPT_FLAG 1
+#define X25_ACCPT_APPRV_FLAG 2
/**
* struct x25_route - x25 routing entry
@@ -150,7 +149,7 @@ struct x25_sock {
struct x25_address source_addr, dest_addr;
struct x25_neigh *neighbour;
unsigned int lci, cudmatchlength;
- unsigned char state, condition, accptapprv;
+ unsigned char state, condition;
unsigned short vs, vr, va, vl;
unsigned long t2, t21, t22, t23;
unsigned short fraglen;