Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes

1 files changed, 36 insertions, 0 deletions

diff --git a/include/uapi/linux/netrom.h b/include/uapi/linux/netrom.h
new file mode 100644
index 000000000000..af7313cc9cb6
--- /dev/null
+++ b/include/uapi/linux/netrom.h
@@ -0,0 +1,36 @@
+/*
+ * These are the public elements of the Linux kernel NET/ROM implementation.
+ * For kernel AX.25 see the file ax25.h. This file requires ax25.h for the
+ * definition of the ax25_address structure.
+ */
+
+#ifndef NETROM_KERNEL_H
+#define NETROM_KERNEL_H
+
+#include <linux/ax25.h>
+
+#define NETROM_MTU      236
+
+#define NETROM_T1       1
+#define NETROM_T2       2
+#define NETROM_N2       3
+#define NETROM_T4       6
+#define NETROM_IDLE     7
+
+#define SIOCNRDECOBS            (SIOCPROTOPRIVATE+2)
+
+struct nr_route_struct {
+#define NETROM_NEIGH    0
+#define NETROM_NODE     1
+        int             type;
+        ax25_address    callsign;
+        char            device[16];
+        unsigned int    quality;
+        char            mnemonic[7];
+        ax25_address    neighbour;
+        unsigned int    obs_count;
+        unsigned int    ndigis;
+        ax25_address    digipeaters[AX25_MAX_DIGIS];
+};
+
+#endif