rxrpc: Move the packet.h include file into net/rxrpc/

Move the protocol description header file into net/rxrpc/ and rename it to
protocol.h.  It's no longer necessary to expose it as packets are no longer
exposed to kernel services (such as AFS) that use the facility.

The abort codes are transferred to the UAPI header instead as we pass these
back to userspace and also to kernel services.

Signed-off-by: David Howells <dhowells@redhat.com>

5 files changed, 45 insertions, 48 deletions

diff --git a/fs/afs/misc.c b/fs/afs/misc.c
index 100b207efc9e..c05f1f1c0d41 100644
--- a/fs/afs/misc.c
+++ b/fs/afs/misc.c
@@ -12,7 +12,6 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/errno.h>
-#include <rxrpc/packet.h>
 #include "internal.h"
 #include "afs_fs.h"
 
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c
index 02781e78ffb6..10743043d431 100644
--- a/fs/afs/rxrpc.c
+++ b/fs/afs/rxrpc.c
@@ -14,7 +14,6 @@
 
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
-#include <rxrpc/packet.h>
 #include "internal.h"
 #include "afs_cm.h"
 
diff --git a/include/uapi/linux/rxrpc.h b/include/uapi/linux/rxrpc.h
index 08e2fb9c70ae..9656aad8f8f7 100644
--- a/include/uapi/linux/rxrpc.h
+++ b/include/uapi/linux/rxrpc.h
@@ -77,4 +77,48 @@ enum rxrpc_cmsg_type {
 #define RXRPC_SECURITY_RXGK     4       /* gssapi-based */
 #define RXRPC_SECURITY_RXK5     5       /* kerberos 5 */
 
+/*
+ * RxRPC-level abort codes
+ */
+#define RX_CALL_DEAD            -1      /* call/conn has been inactive and is shut down */
+#define RX_INVALID_OPERATION    -2      /* invalid operation requested / attempted */
+#define RX_CALL_TIMEOUT         -3      /* call timeout exceeded */
+#define RX_EOF                  -4      /* unexpected end of data on read op */
+#define RX_PROTOCOL_ERROR       -5      /* low-level protocol error */
+#define RX_USER_ABORT           -6      /* generic user abort */
+#define RX_ADDRINUSE            -7      /* UDP port in use */
+#define RX_DEBUGI_BADTYPE       -8      /* bad debugging packet type */
+
+/*
+ * (un)marshalling abort codes (rxgen)
+ */
+#define RXGEN_CC_MARSHAL        -450
+#define RXGEN_CC_UNMARSHAL      -451
+#define RXGEN_SS_MARSHAL        -452
+#define RXGEN_SS_UNMARSHAL      -453
+#define RXGEN_DECODE            -454
+#define RXGEN_OPCODE            -455
+#define RXGEN_SS_XDRFREE        -456
+#define RXGEN_CC_XDRFREE        -457
+
+/*
+ * Rx kerberos security abort codes
+ * - unfortunately we have no generalised security abort codes to say things
+ *   like "unsupported security", so we have to use these instead and hope the
+ *   other side understands
+ */
+#define RXKADINCONSISTENCY      19270400        /* security module structure inconsistent */
+#define RXKADPACKETSHORT        19270401        /* packet too short for security challenge */
+#define RXKADLEVELFAIL          19270402        /* security level negotiation failed */
+#define RXKADTICKETLEN          19270403        /* ticket length too short or too long */
+#define RXKADOUTOFSEQUENCE      19270404        /* packet had bad sequence number */
+#define RXKADNOAUTH             19270405        /* caller not authorised */
+#define RXKADBADKEY             19270406        /* illegal key: bad parity or weak */
+#define RXKADBADTICKET          19270407        /* security object was passed a bad ticket */
+#define RXKADUNKNOWNKEY         19270408        /* ticket contained unknown key version number */
+#define RXKADEXPIRED            19270409        /* authentication expired */
+#define RXKADSEALEDINCON        19270410        /* sealed data inconsistent */
+#define RXKADDATALEN            19270411        /* user data too long */
+#define RXKADILLEGALLEVEL       19270412        /* caller not authorised to use encrypted conns */
+
 #endif /* _UAPI_LINUX_RXRPC_H */
diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index 69b97339ff9d..8c0db9b3e4ab 100644
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -15,7 +15,7 @@
 #include <net/netns/generic.h>
 #include <net/sock.h>
 #include <net/af_rxrpc.h>
-#include <rxrpc/packet.h>
+#include "protocol.h"
 
 #if 0
 #define CHECK_SLAB_OKAY(X)                                   \
diff --git a/include/rxrpc/packet.h b/net/rxrpc/protocol.h
index a2dcfb850b9f..4bddcf3face3 100644
--- a/include/rxrpc/packet.h
+++ b/net/rxrpc/protocol.h
@@ -187,49 +187,4 @@ struct rxkad_response {
         __be32          ticket_len;     /* Kerberos ticket length  */
 } __packed;
 
-/*****************************************************************************/
-/*
- * RxRPC-level abort codes
- */
-#define RX_CALL_DEAD            -1      /* call/conn has been inactive and is shut down */
-#define RX_INVALID_OPERATION    -2      /* invalid operation requested / attempted */
-#define RX_CALL_TIMEOUT         -3      /* call timeout exceeded */
-#define RX_EOF                  -4      /* unexpected end of data on read op */
-#define RX_PROTOCOL_ERROR       -5      /* low-level protocol error */
-#define RX_USER_ABORT           -6      /* generic user abort */
-#define RX_ADDRINUSE            -7      /* UDP port in use */
-#define RX_DEBUGI_BADTYPE       -8      /* bad debugging packet type */
-
-/*
- * (un)marshalling abort codes (rxgen)
- */
-#define RXGEN_CC_MARSHAL    -450
-#define RXGEN_CC_UNMARSHAL  -451
-#define RXGEN_SS_MARSHAL    -452
-#define RXGEN_SS_UNMARSHAL  -453
-#define RXGEN_DECODE        -454
-#define RXGEN_OPCODE        -455
-#define RXGEN_SS_XDRFREE    -456
-#define RXGEN_CC_XDRFREE    -457
-
-/*
- * Rx kerberos security abort codes
- * - unfortunately we have no generalised security abort codes to say things
- *   like "unsupported security", so we have to use these instead and hope the
- *   other side understands
- */
-#define RXKADINCONSISTENCY      19270400        /* security module structure inconsistent */
-#define RXKADPACKETSHORT        19270401        /* packet too short for security challenge */
-#define RXKADLEVELFAIL          19270402        /* security level negotiation failed */
-#define RXKADTICKETLEN          19270403        /* ticket length too short or too long */
-#define RXKADOUTOFSEQUENCE      19270404        /* packet had bad sequence number */
-#define RXKADNOAUTH             19270405        /* caller not authorised */
-#define RXKADBADKEY             19270406        /* illegal key: bad parity or weak */
-#define RXKADBADTICKET          19270407        /* security object was passed a bad ticket */
-#define RXKADUNKNOWNKEY         19270408        /* ticket contained unknown key version number */
-#define RXKADEXPIRED            19270409        /* authentication expired */
-#define RXKADSEALEDINCON        19270410        /* sealed data inconsistent */
-#define RXKADDATALEN            19270411        /* user data too long */
-#define RXKADILLEGALLEVEL       19270412        /* caller not authorised to use encrypted conns */
-
 #endif /* _LINUX_RXRPC_PACKET_H */