o LLC: rename llc_main.[ch] to llc_station.[ch]

First step at coalescing the station handling into just one file,
killing some useless headers in the process.

include/net/llc.h

@@ -76,6 +76,8 @@ extern struct llc_sap *llc_sap_open(unsigned char lsap,
 					       struct packet_type *pt));
 extern void llc_sap_close(struct llc_sap *sap);
 
+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);
 #endif /* LLC_H */

include/net/llc_main.h → include/net/llc_station.h

-#ifndef LLC_MAIN_H
-#define LLC_MAIN_H
+#ifndef LLC_STATION_H
+#define LLC_STATION_H
 /*
  * Copyright (c) 1997 by Procom Technology, Inc.
- * 		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
+ * 		 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.
@@ -55,4 +55,4 @@ extern void llc_station_send_pdu(struct llc_station *station,
 				 struct sk_buff *skb);
 extern int __init llc_station_init(void);
 extern void __exit llc_station_exit(void);
-#endif /* LLC_MAIN_H */
+#endif /* LLC_STATION_H */

net/llc/Makefile

@@ -19,7 +19,7 @@ llc-y := llc_core.o llc_input.o llc_output.o
 obj-$(CONFIG_LLC2) += llc2.o
 
 llc2-y := llc_if.o llc_c_ev.o llc_c_ac.o llc_conn.o llc_c_st.o llc_pdu.o \
-	  llc_sap.o llc_s_ac.o llc_s_ev.o llc_s_st.o af_llc.o llc_main.o \
+	  llc_sap.o llc_s_ac.o llc_s_ev.o llc_s_st.o af_llc.o llc_station.o \
 	  llc_actn.o llc_stat.o llc_evnt.o
 
 llc2-$(CONFIG_PROC_FS) += llc_proc.o

net/llc/af_llc.c

@@ -28,9 +28,9 @@
 #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_main.h>
 #include <net/llc_proc.h>
 
 /* remember: uninitialized global data is zeroed because its in .bss */

net/llc/llc_actn.c

@@ -19,9 +19,10 @@
  */
 #include <linux/netdevice.h>
 #include <net/llc_if.h>
-#include <net/llc_main.h>
 #include <net/llc_evnt.h>
 #include <net/llc_pdu.h>
+#include <net/llc_sap.h>
+#include <net/llc_station.h>
 #include "llc_output.h"
 
 int llc_station_ac_start_ack_timer(struct llc_station *station,

net/llc/llc_c_ac.c

@@ -21,12 +21,12 @@
 #include <net/llc_conn.h>
 #include <net/llc_sap.h>
 #include <net/sock.h>
-#include <net/llc_main.h>
 #include <net/llc_c_ev.h>
 #include <net/llc_c_ac.h>
 #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

@@ -11,20 +11,17 @@
  *
  * See the GNU General Public License for more details.
  */
-#include <linux/netdevice.h>
-#include <linux/interrupt.h>
+
 #include <linux/init.h>
-#include <net/llc_if.h>
 #include <net/llc_sap.h>
+#include <net/llc_station.h>
 #include <net/llc_conn.h>
 #include <net/sock.h>
 #include <linux/tcp.h>
-#include <net/llc_main.h>
 #include <net/llc_c_ev.h>
 #include <net/llc_c_ac.h>
 #include <net/llc_c_st.h>
 #include <net/llc_pdu.h>
-#include <net/llc_s_ev.h>
 
 #if 0
 #define dprintk(args...) printk(KERN_DEBUG args)

net/llc/llc_evnt.c

@@ -16,12 +16,12 @@
  *
  * See the GNU General Public License for more details.
  */
-#include <linux/socket.h>
+
 #include <net/sock.h>
 #include <net/llc_if.h>
-#include <net/llc_main.h>
 #include <net/llc_evnt.h>
 #include <net/llc_pdu.h>
+#include <net/llc_station.h>
 
 int llc_stat_ev_enable_with_dup_addr_check(struct llc_station *station,
 					   struct sk_buff *skb)

net/llc/llc_if.c

@@ -25,7 +25,6 @@
 #include <net/llc_c_ev.h>
 #include <net/llc_c_ac.h>
 #include <net/llc_c_st.h>
-#include <net/llc_main.h>
 
 u8 llc_mac_null_var[IFHWADDRLEN];
 

net/llc/llc_input.c

@@ -15,7 +15,6 @@
 #include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/llc_sap.h>
-#include <net/llc_main.h>
 
 #if 0
 #define dprintk(args...) printk(KERN_DEBUG args)

net/llc/llc_pdu.c

@@ -11,11 +11,9 @@
  *
  * See the GNU General Public License for more details.
  */
+
 #include <linux/netdevice.h>
-#include <linux/if_tr.h>
 #include <net/llc_pdu.h>
-#include <net/llc_if.h>
-#include <net/llc_main.h>
 
 static void llc_pdu_decode_pdu_type(struct sk_buff *skb, u8 *type);
 static u8 llc_pdu_get_pf_bit(struct llc_pdu_sn *pdu);

net/llc/llc_s_ac.c

@@ -17,12 +17,13 @@
  *
  * See the GNU General Public License for more details.
  */
+
 #include <linux/netdevice.h>
-#include <net/llc_if.h>
-#include <net/llc_sap.h>
-#include <net/llc_main.h>
-#include <net/llc_s_ev.h>
+#include <net/llc.h>
 #include <net/llc_pdu.h>
+#include <net/llc_s_ac.h>
+#include <net/llc_s_ev.h>
+#include <net/llc_sap.h>
 #include "llc_output.h"
 
 /**

net/llc/llc_sap.c

@@ -11,17 +11,18 @@
  *
  * See the GNU General Public License for more details.
  */
-#include <linux/skbuff.h>
+
+#include <net/llc.h>
+#include <net/llc_if.h>
 #include <net/llc_conn.h>
+#include <net/llc_pdu.h>
 #include <net/llc_sap.h>
-#include <net/llc_s_ev.h>
 #include <net/llc_s_ac.h>
+#include <net/llc_s_ev.h>
 #include <net/llc_s_st.h>
 #include <net/sock.h>
 #include <linux/tcp.h>
-#include <net/llc_main.h>
-#include <net/llc_pdu.h>
-#include <linux/if_tr.h>
+#include <linux/llc.h>
 
 /**
  *	llc_alloc_frame - allocates sk_buff for frame

net/llc/llc_main.c → net/llc/llc_station.c

 /*
- * llc_main.c - This module contains main functions to manage station, saps
- * 	and connections of the LLC.
+ * llc_station.c - station component of LLC
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  * 		 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
@@ -18,7 +17,7 @@
 #include <net/llc.h>
 #include <net/llc_sap.h>
 #include <net/llc_conn.h>
-#include <net/llc_main.h>
+#include <net/llc_station.h>
 #include <net/llc_evnt.h>
 #include <net/llc_actn.h>
 #include <net/llc_stat.h>