From 4d44110b7d84961784fe971a13cc2ba479d62508 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 19 Sep 2003 07:52:18 -0300 Subject: [PATCH] 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 => llc.h} | 14 ++++++++------ net/llc/Makefile | 4 ++-- net/llc/af_llc.c | 6 +++--- net/llc/llc_actn.c | 1 - net/llc/llc_c_ac.c | 2 +- net/llc/llc_conn.c | 1 - net/llc/{llc_mac.c => llc_input.c} | 4 ++-- net/llc/llc_main.c | 2 +- net/llc/llc_proc.c | 1 - net/llc/llc_s_ac.c | 1 - 10 files changed, 17 insertions(+), 19 deletions(-) rename include/net/{llc_mac.h => llc.h} (92%) rename net/llc/{llc_mac.c => llc_input.c} (98%) diff --git a/include/net/llc_mac.h b/include/net/llc.h similarity index 92% rename from include/net/llc_mac.h rename to include/net/llc.h index 574caad30ece1..810fba19033a4 100644 --- a/include/net/llc_mac.h +++ b/include/net/llc.h @@ -1,5 +1,5 @@ -#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 @@ -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 */ diff --git a/net/llc/Makefile b/net/llc/Makefile index 7a47ade2c4282..0797d39bc1924 100644 --- a/net/llc/Makefile +++ b/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 diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index 6511964841aa0..fdc16cdd34aac 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -24,14 +24,14 @@ #include #include #include +#include +#include +#include #include #include #include -#include #include #include -#include -#include /* remember: uninitialized global data is zeroed because its in .bss */ static u16 llc_ui_sap_last_autoport = LLC_SAP_DYN_START; diff --git a/net/llc/llc_actn.c b/net/llc/llc_actn.c index db252bead811d..ba12d79684552 100644 --- a/net/llc/llc_actn.c +++ b/net/llc/llc_actn.c @@ -22,7 +22,6 @@ #include #include #include -#include #include "llc_output.h" int llc_station_ac_start_ack_timer(struct llc_station *station, diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c index c0acd7084ebad..53b74935412fd 100644 --- a/net/llc/llc_c_ac.c +++ b/net/llc/llc_c_ac.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "llc_output.h" diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c index 4409eb5711beb..3e138cefcdc7f 100644 --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include diff --git a/net/llc/llc_mac.c b/net/llc/llc_input.c similarity index 98% rename from net/llc/llc_mac.c rename to net/llc/llc_input.c index d7a453b64ba69..ec10341a6228a 100644 --- a/net/llc/llc_mac.c +++ b/net/llc/llc_input.c @@ -1,5 +1,5 @@ /* - * 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 @@ -12,7 +12,7 @@ * See the GNU General Public License for more details. */ #include -#include +#include #include #include #include diff --git a/net/llc/llc_main.c b/net/llc/llc_main.c index 1986971279755..193bd28677c23 100644 --- a/net/llc/llc_main.c +++ b/net/llc/llc_main.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -27,7 +28,6 @@ #include #include #include -#include #include /* static function prototypes */ diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c index 3addf7c081e44..8b94d26f3ee58 100644 --- a/net/llc/llc_proc.c +++ b/net/llc/llc_proc.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/net/llc/llc_s_ac.c b/net/llc/llc_s_ac.c index c63e76e45850f..5cfebe2d1520a 100644 --- a/net/llc/llc_s_ac.c +++ b/net/llc/llc_s_ac.c @@ -23,7 +23,6 @@ #include #include #include -#include #include "llc_output.h" /** -- 2.53.0