1 files changed, 3 insertions, 71 deletions
diff --git a/include/linux/llc.h b/include/linux/llc.h
index a2418ae13ee..b965314d017 100644
--- a/include/linux/llc.h
+++ b/include/linux/llc.h
@@ -1,5 +1,3 @@
-#ifndef __LINUX_LLC_H
-#define __LINUX_LLC_H
 /*
 * IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
 *
@@ -12,80 +10,14 @@
 *
 * See the GNU General Public License for more details.
 */
+#ifndef __LINUX_LLC_H
+#define __LINUX_LLC_H
-#include <linux/socket.h>
+#include <uapi/linux/llc.h>
-#define __LLC_SOCK_SIZE__ 16    /* sizeof(sockaddr_llc), word align. */
-struct sockaddr_llc {
-        __kernel_sa_family_t sllc_family; /* AF_LLC */
-        __kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */
-        unsigned char   sllc_test;
-        unsigned char   sllc_xid;
-        unsigned char   sllc_ua;        /* UA data, only for SOCK_STREAM. */
-        unsigned char   sllc_sap;
-        unsigned char   sllc_mac[IFHWADDRLEN];
-        unsigned char   __pad[__LLC_SOCK_SIZE__ -
-                              sizeof(__kernel_sa_family_t) * 2 -
-                              sizeof(unsigned char) * 4 - IFHWADDRLEN];
-};
-/* sockopt definitions. */
-enum llc_sockopts {
-        LLC_OPT_UNKNOWN = 0,
-        LLC_OPT_RETRY,          /* max retrans attempts. */
-        LLC_OPT_SIZE,           /* max PDU size (octets). */
-        LLC_OPT_ACK_TMR_EXP,    /* ack expire time (secs). */
-        LLC_OPT_P_TMR_EXP,      /* pf cycle expire time (secs). */
-        LLC_OPT_REJ_TMR_EXP,    /* rej sent expire time (secs). */
-        LLC_OPT_BUSY_TMR_EXP,   /* busy state expire time (secs). */
-        LLC_OPT_TX_WIN,         /* tx window size. */
-        LLC_OPT_RX_WIN,         /* rx window size. */
-        LLC_OPT_PKTINFO,        /* ancillary packet information. */
-        LLC_OPT_MAX
-};
-#define LLC_OPT_MAX_RETRY        100
-#define LLC_OPT_MAX_SIZE        4196
-#define LLC_OPT_MAX_WIN          127
-#define LLC_OPT_MAX_ACK_TMR_EXP   60
-#define LLC_OPT_MAX_P_TMR_EXP     60
-#define LLC_OPT_MAX_REJ_TMR_EXP   60
-#define LLC_OPT_MAX_BUSY_TMR_EXP  60
-/* LLC SAP types. */
-#define LLC_SAP_NULL    0x00            /* NULL SAP.                    */
-#define LLC_SAP_LLC     0x02            /* LLC Sublayer Management.     */
-#define LLC_SAP_SNA     0x04            /* SNA Path Control.            */
-#define LLC_SAP_PNM     0x0E            /* Proway Network Management.   */      
-#define LLC_SAP_IP      0x06            /* TCP/IP.                      */
-#define LLC_SAP_BSPAN   0x42            /* Bridge Spanning Tree Proto   */
-#define LLC_SAP_MMS     0x4E            /* Manufacturing Message Srv.   */
-#define LLC_SAP_8208    0x7E            /* ISO 8208                     */
-#define LLC_SAP_3COM    0x80            /* 3COM.                        */
-#define LLC_SAP_PRO     0x8E            /* Proway Active Station List   */
-#define LLC_SAP_SNAP    0xAA            /* SNAP.                        */
-#define LLC_SAP_BANYAN  0xBC            /* Banyan.                      */
-#define LLC_SAP_IPX     0xE0            /* IPX/SPX.                     */
-#define LLC_SAP_NETBEUI 0xF0            /* NetBEUI.                     */
-#define LLC_SAP_LANMGR  0xF4            /* LanManager.                  */
-#define LLC_SAP_IMPL    0xF8            /* IMPL                         */
-#define LLC_SAP_DISC    0xFC            /* Discovery                    */
-#define LLC_SAP_OSI     0xFE            /* OSI Network Layers.          */
-#define LLC_SAP_LAR     0xDC            /* LAN Address Resolution       */
-#define LLC_SAP_RM      0xD4            /* Resource Management          */
-#define LLC_SAP_GLOBAL  0xFF            /* Global SAP.                  */
-struct llc_pktinfo {
-        int lpi_ifindex;
-        unsigned char lpi_sap;
-        unsigned char lpi_mac[IFHWADDRLEN];
-};
-#ifdef __KERNEL__
 #define LLC_SAP_DYN_START       0xC0
 #define LLC_SAP_DYN_STOP        0xDE
 #define LLC_SAP_DYN_TRIES       4
 #define llc_ui_skb_cb(__skb) ((struct sockaddr_llc *)&((__skb)->cb[0]))
-#endif /* __KERNEL__ */
 #endif /* __LINUX_LLC_H */

diff --git a/include/linux/llc.h b/include/linux/llc.h index a2418ae13ee..b965314d017 100644 --- a/include/linux/llc.h +++ b/include/linux/llc.h
@@ -1,5 +1,3 @@
1	#ifndef __LINUX_LLC_H
2	#define __LINUX_LLC_H
3	/*	1	/*
4	* IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.	2	* IEEE 802.2 User Interface SAPs for Linux, data structures and indicators.
5	*	3	*
@@ -12,80 +10,14 @@
12	*	10	*
13	* See the GNU General Public License for more details.	11	* See the GNU General Public License for more details.
14	*/	12	*/
		13	#ifndef __LINUX_LLC_H
		14	#define __LINUX_LLC_H
15		15
16	#include <linux/socket.h>	16	#include <uapi/linux/llc.h>
17
18	#define __LLC_SOCK_SIZE__ 16 /* sizeof(sockaddr_llc), word align. */
19	struct sockaddr_llc {
20	__kernel_sa_family_t sllc_family; /* AF_LLC */
21	__kernel_sa_family_t sllc_arphrd; /* ARPHRD_ETHER */
22	unsigned char sllc_test;
23	unsigned char sllc_xid;
24	unsigned char sllc_ua; /* UA data, only for SOCK_STREAM. */
25	unsigned char sllc_sap;
26	unsigned char sllc_mac[IFHWADDRLEN];
27	unsigned char __pad[__LLC_SOCK_SIZE__ -
28	sizeof(__kernel_sa_family_t) * 2 -
29	sizeof(unsigned char) * 4 - IFHWADDRLEN];
30	};
31
32	/* sockopt definitions. */
33	enum llc_sockopts {
34	LLC_OPT_UNKNOWN = 0,
35	LLC_OPT_RETRY, /* max retrans attempts. */
36	LLC_OPT_SIZE, /* max PDU size (octets). */
37	LLC_OPT_ACK_TMR_EXP, /* ack expire time (secs). */
38	LLC_OPT_P_TMR_EXP, /* pf cycle expire time (secs). */
39	LLC_OPT_REJ_TMR_EXP, /* rej sent expire time (secs). */
40	LLC_OPT_BUSY_TMR_EXP, /* busy state expire time (secs). */
41	LLC_OPT_TX_WIN, /* tx window size. */
42	LLC_OPT_RX_WIN, /* rx window size. */
43	LLC_OPT_PKTINFO, /* ancillary packet information. */
44	LLC_OPT_MAX
45	};
46
47	#define LLC_OPT_MAX_RETRY 100
48	#define LLC_OPT_MAX_SIZE 4196
49	#define LLC_OPT_MAX_WIN 127
50	#define LLC_OPT_MAX_ACK_TMR_EXP 60
51	#define LLC_OPT_MAX_P_TMR_EXP 60
52	#define LLC_OPT_MAX_REJ_TMR_EXP 60
53	#define LLC_OPT_MAX_BUSY_TMR_EXP 60
54
55	/* LLC SAP types. */
56	#define LLC_SAP_NULL 0x00 /* NULL SAP. */
57	#define LLC_SAP_LLC 0x02 /* LLC Sublayer Management. */
58	#define LLC_SAP_SNA 0x04 /* SNA Path Control. */
59	#define LLC_SAP_PNM 0x0E /* Proway Network Management. */
60	#define LLC_SAP_IP 0x06 /* TCP/IP. */
61	#define LLC_SAP_BSPAN 0x42 /* Bridge Spanning Tree Proto */
62	#define LLC_SAP_MMS 0x4E /* Manufacturing Message Srv. */
63	#define LLC_SAP_8208 0x7E /* ISO 8208 */
64	#define LLC_SAP_3COM 0x80 /* 3COM. */
65	#define LLC_SAP_PRO 0x8E /* Proway Active Station List */
66	#define LLC_SAP_SNAP 0xAA /* SNAP. */
67	#define LLC_SAP_BANYAN 0xBC /* Banyan. */
68	#define LLC_SAP_IPX 0xE0 /* IPX/SPX. */
69	#define LLC_SAP_NETBEUI 0xF0 /* NetBEUI. */
70	#define LLC_SAP_LANMGR 0xF4 /* LanManager. */
71	#define LLC_SAP_IMPL 0xF8 /* IMPL */
72	#define LLC_SAP_DISC 0xFC /* Discovery */
73	#define LLC_SAP_OSI 0xFE /* OSI Network Layers. */
74	#define LLC_SAP_LAR 0xDC /* LAN Address Resolution */
75	#define LLC_SAP_RM 0xD4 /* Resource Management */
76	#define LLC_SAP_GLOBAL 0xFF /* Global SAP. */
77
78	struct llc_pktinfo {
79	int lpi_ifindex;
80	unsigned char lpi_sap;
81	unsigned char lpi_mac[IFHWADDRLEN];
82	};
83		17
84	#ifdef __KERNEL__
85	#define LLC_SAP_DYN_START 0xC0	18	#define LLC_SAP_DYN_START 0xC0
86	#define LLC_SAP_DYN_STOP 0xDE	19	#define LLC_SAP_DYN_STOP 0xDE
87	#define LLC_SAP_DYN_TRIES 4	20	#define LLC_SAP_DYN_TRIES 4
88		21
89	#define llc_ui_skb_cb(__skb) ((struct sockaddr_llc *)&((__skb)->cb[0]))	22	#define llc_ui_skb_cb(__skb) ((struct sockaddr_llc *)&((__skb)->cb[0]))
90	#endif /* __KERNEL__ */
91	#endif /* __LINUX_LLC_H */	23	#endif /* __LINUX_LLC_H */