From 874d7485a12b0eff4eb32f4794fda1d343278a0c Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Fri, 19 Sep 2003 20:52:42 -0300 Subject: [PATCH] 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 | 3 +++ include/net/llc_conn.h | 8 ++++++ include/net/llc_station.h | 53 --------------------------------------- net/llc/af_llc.c | 1 - net/llc/llc_c_ac.c | 1 - net/llc/llc_conn.c | 1 - net/llc/llc_station.c | 26 ++++++++++++++++++- 7 files changed, 36 insertions(+), 57 deletions(-) delete mode 100644 include/net/llc_station.h diff --git a/include/net/llc.h b/include/net/llc.h index 773274d8eaf0a..bf3882be35290 100644 --- a/include/net/llc.h +++ b/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 */ diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h index e1adbb9215467..06fb01bccdbf4 100644 --- a/include/net/llc_conn.h +++ b/include/net/llc_conn.h @@ -15,6 +15,14 @@ #include #include +#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 */ diff --git a/include/net/llc_station.h b/include/net/llc_station.h deleted file mode 100644 index 5f1a3bc748b1d..0000000000000 --- a/include/net/llc_station.h +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef LLC_STATION_H -#define LLC_STATION_H -/* - * Copyright (c) 1997 by Procom Technology, Inc. - * 2001-2003 by Arnaldo Carvalho de Melo - * - * 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 - -#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 */ diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c index a276bc8d73f1f..693f2a5f457ce 100644 --- a/net/llc/af_llc.c +++ b/net/llc/af_llc.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include diff --git a/net/llc/llc_c_ac.c b/net/llc/llc_c_ac.c index cd5e2f91fdffb..f04f96fe5080b 100644 --- a/net/llc/llc_c_ac.c +++ b/net/llc/llc_c_ac.c @@ -26,7 +26,6 @@ #include #include #include -#include #include "llc_output.h" diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c index 837fd935c0e11..0b4dffbf2824e 100644 --- a/net/llc/llc_conn.c +++ b/net/llc/llc_conn.c @@ -14,7 +14,6 @@ #include #include -#include #include #include #include diff --git a/net/llc/llc_station.c b/net/llc/llc_station.c index a693298926f82..76177cdcf5913 100644 --- a/net/llc/llc_station.c +++ b/net/llc/llc_station.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -26,6 +25,31 @@ #include #include +/** + * 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 -- 2.53.0