o LLC: rename llc_mac.c to llc_input.c, net/llc_mac.h to net/llc.h

Next step: to have llc_build_and_send_ui_pkt in llc_output.c, not
using the silly sap state machinery.

include/net/llc_mac.h → include/net/llc.h

-#ifndef LLC_MAC_H
-#define LLC_MAC_H
+#ifndef LLC_H
+#define LLC_H
 /*
  * Copyright (c) 1997 by Procom Technology, Inc.
  * 		 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
@@ -16,15 +16,17 @@
 #define LLC_DEST_SAP             1      /* Type 1 goes here */
 #define LLC_DEST_CONN            2      /* Type 2 goes here */
 
-extern int llc_rcv(struct sk_buff *skb, struct net_device *dev,
-		   struct packet_type *pt);
-
 struct llc_sap;
+struct net_device;
+struct packet_type;
 struct sk_buff;
 
+extern int llc_rcv(struct sk_buff *skb, struct net_device *dev,
+		   struct packet_type *pt);
+
 extern void llc_add_pack(int type, void (*handler)(struct llc_sap *sap,
 						   struct sk_buff *skb));
 extern void llc_remove_pack(int type);
 
 extern void llc_set_station_handler(void (*handler)(struct sk_buff *skb));
-#endif /* LLC_MAC_H */
+#endif /* LLC_H */

net/llc/Makefile

@@ -14,8 +14,8 @@
 
 obj-$(CONFIG_LLC_CORE) += llc_core.o
 
-llc_core-y := llc_mac.o llc_sap.o llc_s_st.o llc_s_ac.o llc_s_ev.o llc_main.o \
-	      llc_actn.o llc_stat.o llc_evnt.o llc_output.o
+llc_core-y := llc_input.o llc_output.o llc_s_st.o llc_s_ac.o llc_s_ev.o \
+	      llc_main.o llc_actn.o llc_stat.o llc_evnt.o llc_sap.o
 
 obj-$(CONFIG_LLC2) += llc2.o
 

net/llc/af_llc.c

@@ -24,14 +24,14 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/tcp.h>
+#include <linux/rtnetlink.h>
+#include <linux/init.h>
+#include <net/llc.h>
 #include <net/llc_sap.h>
 #include <net/llc_pdu.h>
 #include <net/llc_conn.h>
-#include <net/llc_mac.h>
 #include <net/llc_main.h>
 #include <net/llc_proc.h>
-#include <linux/rtnetlink.h>
-#include <linux/init.h>
 
 /* remember: uninitialized global data is zeroed because its in .bss */
 static u16 llc_ui_sap_last_autoport = LLC_SAP_DYN_START;

net/llc/llc_actn.c

@@ -22,7 +22,6 @@
 #include <net/llc_main.h>
 #include <net/llc_evnt.h>
 #include <net/llc_pdu.h>
-#include <net/llc_mac.h>
 #include "llc_output.h"
 
 int llc_station_ac_start_ack_timer(struct llc_station *station,

net/llc/llc_c_ac.c

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

net/llc/llc_conn.c

@@ -23,7 +23,6 @@
 #include <net/llc_c_ev.h>
 #include <net/llc_c_ac.h>
 #include <net/llc_c_st.h>
-#include <net/llc_mac.h>
 #include <net/llc_pdu.h>
 #include <net/llc_s_ev.h>
 

net/llc/llc_mac.c → net/llc/llc_input.c

 /*
- * llc_mac.c - Manages interface between LLC and MAC
+ * llc_input.c - Minimal input path for LLC
  *
  * Copyright (c) 1997 by Procom Technology, Inc.
  * 		 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
@@ -12,7 +12,7 @@
  * See the GNU General Public License for more details.
  */
 #include <linux/netdevice.h>
-#include <net/llc_mac.h>
+#include <net/llc.h>
 #include <net/llc_pdu.h>
 #include <net/llc_sap.h>
 #include <net/llc_main.h>

net/llc/llc_main.c

@@ -15,6 +15,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <net/llc.h>
 #include <net/llc_sap.h>
 #include <net/llc_conn.h>
 #include <net/llc_main.h>
@@ -27,7 +28,6 @@
 #include <net/llc_c_st.h>
 #include <net/llc_s_ev.h>
 #include <net/llc_s_st.h>
-#include <net/llc_mac.h>
 #include <net/llc_proc.h>
 
 /* static function prototypes */

net/llc/llc_proc.c

@@ -24,7 +24,6 @@
 #include <net/llc_c_ev.h>
 #include <net/llc_c_st.h>
 #include <net/llc_conn.h>
-#include <net/llc_mac.h>
 #include <net/llc_main.h>
 #include <net/llc_sap.h>
 

net/llc/llc_s_ac.c

@@ -23,7 +23,6 @@
 #include <net/llc_main.h>
 #include <net/llc_s_ev.h>
 #include <net/llc_pdu.h>
-#include <net/llc_mac.h>
 #include "llc_output.h"
 
 /**