o LLC: llc_station.h is not useful anymore, kill it

Some defines had no place in this header, moved to llc_conn.h,
the struct llc_station, that probably will disappear in the near
future, is used only in llc_station.c, so remove one more
file from the include forest.

include/net/llc.h

@@ -85,4 +85,7 @@ extern struct llc_sap *llc_sap_find(unsigned char sap_value);
 
 extern int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
 				     unsigned char *dmac, unsigned char dsap);
+
+extern int llc_station_init(void);
+extern void llc_station_exit(void);
 #endif /* LLC_H */

include/net/llc_conn.h

@@ -15,6 +15,14 @@
 #include <net/llc_if.h>
 #include <linux/llc.h>
 
+#define LLC_EVENT                1
+#define LLC_PACKET               2
+
+#define LLC_P_TIME               2
+#define LLC_ACK_TIME             1
+#define LLC_REJ_TIME             3
+#define LLC_BUSY_TIME            3
+
 struct llc_timer {
 	struct timer_list timer;
 	u16		  expire;	/* timer expire time */

include/net/llc_station.h

-#ifndef LLC_STATION_H
-#define LLC_STATION_H
-/*
- * Copyright (c) 1997 by Procom Technology, Inc.
- * 		 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- *
- * This program can be redistributed or modified under the terms of the
- * GNU General Public License as published by the Free Software Foundation.
- * This program is distributed without any warranty or implied warranty
- * of merchantability or fitness for a particular purpose.
- *
- * See the GNU General Public License for more details.
- */
-
-#include <linux/skbuff.h>
-
-#define LLC_EVENT		 1
-#define LLC_PACKET		 2
-#define LLC_TYPE_1		 1
-#define LLC_TYPE_2		 2
-#define LLC_P_TIME		 2
-#define LLC_ACK_TIME		 1
-#define LLC_REJ_TIME		 3
-#define LLC_BUSY_TIME		 3
-
-/**
- * struct llc_station - LLC station component
- *
- * SAP and connection resource manager, one per adapter.
- *
- * @state - state of station
- * @xid_r_count - XID response PDU counter
- * @mac_sa - MAC source address
- * @sap_list - list of related SAPs
- * @ev_q - events entering state mach.
- * @mac_pdu_q - PDUs ready to send to MAC
- */
-struct llc_station {
-	u8			    state;
-	u8			    xid_r_count;
-	struct timer_list	    ack_timer;
-	u8			    retry_count;
-	u8			    maximum_retry;
-	struct {
-		struct sk_buff_head list;
-		spinlock_t	    lock;
-	} ev_q;
-	struct sk_buff_head	    mac_pdu_q;
-};
-
-extern int __init llc_station_init(void);
-extern void __exit llc_station_exit(void);
-#endif /* LLC_STATION_H */

net/llc/af_llc.c

@@ -28,7 +28,6 @@
 #include <linux/init.h>
 #include <net/llc.h>
 #include <net/llc_sap.h>
-#include <net/llc_station.h>
 #include <net/llc_pdu.h>
 #include <net/llc_conn.h>
 #include <net/llc_proc.h>

net/llc/llc_c_ac.c

@@ -26,7 +26,6 @@
 #include <net/llc_c_st.h>
 #include <net/llc_pdu.h>
 #include <net/llc.h>
-#include <net/llc_station.h>
 
 #include "llc_output.h"
 

net/llc/llc_conn.c

@@ -14,7 +14,6 @@
 
 #include <linux/init.h>
 #include <net/llc_sap.h>
-#include <net/llc_station.h>
 #include <net/llc_conn.h>
 #include <net/sock.h>
 #include <linux/tcp.h>

net/llc/llc_station.c

@@ -17,7 +17,6 @@
 #include <net/llc.h>
 #include <net/llc_sap.h>
 #include <net/llc_conn.h>
-#include <net/llc_station.h>
 #include <net/llc_c_ac.h>
 #include <net/llc_s_ac.h>
 #include <net/llc_c_ev.h>
@@ -26,6 +25,31 @@
 #include <net/llc_s_st.h>
 #include <net/llc_pdu.h>
 
+/**
+ * struct llc_station - LLC station component
+ *
+ * SAP and connection resource manager, one per adapter.
+ *
+ * @state - state of station
+ * @xid_r_count - XID response PDU counter
+ * @mac_sa - MAC source address
+ * @sap_list - list of related SAPs
+ * @ev_q - events entering state mach.
+ * @mac_pdu_q - PDUs ready to send to MAC
+ */
+struct llc_station {
+	u8			    state;
+	u8			    xid_r_count;
+	struct timer_list	    ack_timer;
+	u8			    retry_count;
+	u8			    maximum_retry;
+	struct {
+		struct sk_buff_head list;
+		spinlock_t	    lock;
+	} ev_q;
+	struct sk_buff_head	    mac_pdu_q;
+};
+
 /* Types of events (possible values in 'ev->type') */
 #define LLC_STATION_EV_TYPE_SIMPLE	1
 #define LLC_STATION_EV_TYPE_CONDITION	2