llc: move the type 2 sockets out of tree

802.2 LLC is only used in tree by protocols which need the
connectionless type 1 subset: STP, which carries the bridge's BPDUs,
GARP, which sends its own UI PDUs, and SNAP. The llc2 module on top of
the core - the type 2 connection state machine, the type 1 SAP state
machine, the station component and the PF_LLC socket family - has no
in-kernel users and nobody who can test it; what we get instead is a
slow trickle of drive-by fixes.

There was a recent patch from Ernestas Kulik indicating potential
real life use, but it was new/experimental and that person is
not responding to off-list pings.

Let LLC2 follow AX.25, hamradio and AppleTalk out of the Linux tree.
We will maintain the code at: github.com/linux-netdev/mod-orphan
for anyone interested in playing with it.

PF_LLC goes in full, both the class two SOCK_STREAM and the class one
SOCK_DGRAM half, and so do /proc/net/llc/ and /proc/sys/net/llc/. Note
that the kernel also stops answering XID and TEST commands, addressed
to a SAP or to the station - those are type 1, but they lived in the
module, and they got answered whether or not any socket was open.
Nothing in tree asks for them; what the core keeps is SAP registration
and the UI path the in-tree users need.

Retain the uAPI for now, like we did for AppleTalk. Only the socket ABI
half of it is vestigial: STP, GARP, the bridge and openvswitch use the
SAP numbers it defines. Cleaning up what the core no longer needs
follows in the next patch.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Link: https://patch.msgid.link/20260928190800.2521749-2-kuba@kernel.org
Reviewed-by: Nikolay Aleksandrov <razor@blackwall.org>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

11 files changed, 0 insertions, 805 deletions

diff --git a/include/linux/llc.h b/include/linux/llc.h
index 944e9e213112..c03bb12bcc9c 100644
--- a/include/linux/llc.h
+++ b/include/linux/llc.h
@@ -9,9 +9,4 @@
 
 #include <uapi/linux/llc.h>
 
-#define LLC_SAP_DYN_START	0xC0
-#define LLC_SAP_DYN_STOP	0xDE
-#define LLC_SAP_DYN_TRIES	4
-
-#define llc_ui_skb_cb(__skb) ((struct sockaddr_llc *)&((__skb)->cb[0]))
 #endif /* __LINUX_LLC_H */
diff --git a/include/net/llc.h b/include/net/llc.h
index 029ba8a22319..8ea44ed98c4d 100644
--- a/include/net/llc.h
+++ b/include/net/llc.h
@@ -130,30 +130,4 @@ struct llc_sap *llc_sap_find(unsigned char sap_value);
 
 int llc_build_and_send_ui_pkt(struct llc_sap *sap, struct sk_buff *skb,
 			      const unsigned char *dmac, unsigned char dsap);
-
-void llc_sap_handler(struct llc_sap *sap, struct sk_buff *skb);
-void llc_conn_handler(struct llc_sap *sap, struct sk_buff *skb);
-
-void llc_station_init(void);
-void llc_station_exit(void);
-
-#ifdef CONFIG_PROC_FS
-int llc_proc_init(void);
-void llc_proc_exit(void);
-#else
-#define llc_proc_init()	(0)
-#define llc_proc_exit()	do { } while(0)
-#endif /* CONFIG_PROC_FS */
-#ifdef CONFIG_SYSCTL
-int llc_sysctl_init(void);
-void llc_sysctl_exit(void);
-
-extern int sysctl_llc2_ack_timeout;
-extern int sysctl_llc2_busy_timeout;
-extern int sysctl_llc2_p_timeout;
-extern int sysctl_llc2_rej_timeout;
-#else
-#define llc_sysctl_init() (0)
-#define llc_sysctl_exit() do { } while(0)
-#endif /* CONFIG_SYSCTL */
 #endif /* LLC_H */
diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
deleted file mode 100644
index af31a49bebb0..000000000000
--- a/include/net/llc_c_ac.h
+++ /dev/null
@@ -1,180 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_C_AC_H
-#define LLC_C_AC_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- * 		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-/* Connection component state transition actions */
-/*
- * Connection state transition actions
- * (Fb = F bit; Pb = P bit; Xb = X bit)
- */
-
-#include <linux/types.h>
-
-struct sk_buff;
-struct sock;
-struct timer_list;
-
-#define LLC_CONN_AC_CLR_REMOTE_BUSY			 1
-#define LLC_CONN_AC_CONN_IND				 2
-#define LLC_CONN_AC_CONN_CONFIRM			 3
-#define LLC_CONN_AC_DATA_IND				 4
-#define LLC_CONN_AC_DISC_IND				 5
-#define LLC_CONN_AC_RESET_IND				 6
-#define LLC_CONN_AC_RESET_CONFIRM			 7
-#define LLC_CONN_AC_REPORT_STATUS			 8
-#define LLC_CONN_AC_CLR_REMOTE_BUSY_IF_Fb_EQ_1		 9
-#define LLC_CONN_AC_STOP_REJ_TMR_IF_DATA_FLAG_EQ_2	10
-#define LLC_CONN_AC_SEND_DISC_CMD_Pb_SET_X		11
-#define LLC_CONN_AC_SEND_DM_RSP_Fb_SET_Pb		12
-#define LLC_CONN_AC_SEND_DM_RSP_Fb_SET_1		13
-#define LLC_CONN_AC_SEND_DM_RSP_Fb_SET_F_FLAG		14
-#define LLC_CONN_AC_SEND_FRMR_RSP_Fb_SET_X		15
-#define LLC_CONN_AC_RESEND_FRMR_RSP_Fb_SET_0		16
-#define LLC_CONN_AC_RESEND_FRMR_RSP_Fb_SET_Pb		17
-#define LLC_CONN_AC_SEND_I_CMD_Pb_SET_1			18
-#define LLC_CONN_AC_RESEND_I_CMD_Pb_SET_1		19
-#define LLC_CONN_AC_RESEND_I_CMD_Pb_SET_1_OR_SEND_RR	20
-#define LLC_CONN_AC_SEND_I_XXX_Xb_SET_0			21
-#define LLC_CONN_AC_RESEND_I_XXX_Xb_SET_0		22
-#define LLC_CONN_AC_RESEND_I_XXX_Xb_SET_0_OR_SEND_RR	23
-#define LLC_CONN_AC_RESEND_I_RSP_Fb_SET_1		24
-#define LLC_CONN_AC_SEND_REJ_CMD_Pb_SET_1		25
-#define LLC_CONN_AC_SEND_REJ_RSP_Fb_SET_1		26
-#define LLC_CONN_AC_SEND_REJ_XXX_Xb_SET_0		27
-#define LLC_CONN_AC_SEND_RNR_CMD_Pb_SET_1		28
-#define LLC_CONN_AC_SEND_RNR_RSP_Fb_SET_1		29
-#define LLC_CONN_AC_SEND_RNR_XXX_Xb_SET_0		30
-#define LLC_CONN_AC_SET_REMOTE_BUSY			31
-#define LLC_CONN_AC_OPTIONAL_SEND_RNR_XXX_Xb_SET_0	32
-#define LLC_CONN_AC_SEND_RR_CMD_Pb_SET_1		33
-#define LLC_CONN_AC_SEND_ACK_CMD_Pb_SET_1		34
-#define LLC_CONN_AC_SEND_RR_RSP_Fb_SET_1		35
-#define LLC_CONN_AC_SEND_ACK_RSP_Fb_SET_1		36
-#define LLC_CONN_AC_SEND_RR_XXX_Xb_SET_0		37
-#define LLC_CONN_AC_SEND_ACK_XXX_Xb_SET_0		38
-#define LLC_CONN_AC_SEND_SABME_CMD_Pb_SET_X		39
-#define LLC_CONN_AC_SEND_UA_RSP_Fb_SET_Pb		40
-#define LLC_CONN_AC_SEND_UA_RSP_Fb_SET_F_FLAG		41
-#define LLC_CONN_AC_S_FLAG_SET_0			42
-#define LLC_CONN_AC_S_FLAG_SET_1			43
-#define LLC_CONN_AC_START_P_TMR				44
-#define LLC_CONN_AC_START_ACK_TMR			45
-#define LLC_CONN_AC_START_REJ_TMR			46
-#define LLC_CONN_AC_START_ACK_TMR_IF_NOT_RUNNING	47
-#define LLC_CONN_AC_STOP_ACK_TMR			48
-#define LLC_CONN_AC_STOP_P_TMR				49
-#define LLC_CONN_AC_STOP_REJ_TMR			50
-#define LLC_CONN_AC_STOP_ALL_TMRS			51
-#define LLC_CONN_AC_STOP_OTHER_TMRS			52
-#define LLC_CONN_AC_UPDATE_Nr_RECEIVED			53
-#define LLC_CONN_AC_UPDATE_P_FLAG			54
-#define LLC_CONN_AC_DATA_FLAG_SET_2			55
-#define LLC_CONN_AC_DATA_FLAG_SET_0			56
-#define LLC_CONN_AC_DATA_FLAG_SET_1			57
-#define LLC_CONN_AC_DATA_FLAG_SET_1_IF_DATA_FLAG_EQ_0	58
-#define LLC_CONN_AC_P_FLAG_SET_0			59
-#define LLC_CONN_AC_P_FLAG_SET_P			60
-#define LLC_CONN_AC_REMOTE_BUSY_SET_0			61
-#define LLC_CONN_AC_RETRY_CNT_SET_0			62
-#define LLC_CONN_AC_RETRY_CNT_INC_BY_1			63
-#define LLC_CONN_AC_Vr_SET_0				64
-#define LLC_CONN_AC_Vr_INC_BY_1				65
-#define LLC_CONN_AC_Vs_SET_0				66
-#define LLC_CONN_AC_Vs_SET_Nr				67
-#define LLC_CONN_AC_F_FLAG_SET_P			68
-#define LLC_CONN_AC_STOP_SENDACK_TMR			70
-#define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING	71
-
-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
-
-int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_conn_confirm(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_data_ind(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_disc_ind(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_rst_ind(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_rst_confirm(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_clear_remote_busy_if_f_eq_1(struct sock *sk,
-					    struct sk_buff *skb);
-int llc_conn_ac_stop_rej_tmr_if_data_flag_eq_2(struct sock *sk,
-					       struct sk_buff *skb);
-int llc_conn_ac_send_disc_cmd_p_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_dm_rsp_f_set_p(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_dm_rsp_f_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_frmr_rsp_f_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_resend_frmr_rsp_f_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_resend_frmr_rsp_f_set_p(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_i_cmd_p_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_i_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_resend_i_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_resend_i_xxx_x_set_0_or_send_rr(struct sock *sk,
-						struct sk_buff *skb);
-int llc_conn_ac_resend_i_rsp_f_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rej_cmd_p_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rej_rsp_f_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rej_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rnr_cmd_p_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rnr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_remote_busy(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_opt_send_rnr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rr_cmd_p_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rr_rsp_f_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_ack_rsp_f_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_rr_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_ack_xxx_x_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_sabme_cmd_p_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_ua_rsp_f_set_p(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_s_flag_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_s_flag_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_start_p_timer(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_start_ack_timer(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_start_rej_timer(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_start_ack_tmr_if_not_running(struct sock *sk,
-					     struct sk_buff *skb);
-int llc_conn_ac_stop_ack_timer(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_stop_p_timer(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_stop_rej_timer(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_stop_all_timers(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_stop_other_timers(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_upd_nr_received(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_inc_tx_win_size(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_dec_tx_win_size(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_upd_p_flag(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_data_flag_2(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_data_flag_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_data_flag_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_data_flag_1_if_data_flag_eq_0(struct sock *sk,
-						  struct sk_buff *skb);
-int llc_conn_ac_set_p_flag_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_remote_busy_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_retry_cnt_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_cause_flag_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_cause_flag_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_inc_retry_cnt_by_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_vr_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_inc_vr_by_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_vs_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_set_vs_nr(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_rst_vs(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_upd_vs(struct sock *sk, struct sk_buff *skb);
-int llc_conn_disc(struct sock *sk, struct sk_buff *skb);
-int llc_conn_reset(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_disc_confirm(struct sock *sk, struct sk_buff *skb);
-u8 llc_circular_between(u8 a, u8 b, u8 c);
-int llc_conn_ac_send_ack_if_needed(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_adjust_npta_by_rr(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_adjust_npta_by_rnr(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_rst_sendack_flag(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ac_send_i_as_ack(struct sock *sk, struct sk_buff *skb);
-
-void llc_conn_busy_tmr_cb(struct timer_list *t);
-void llc_conn_pf_cycle_tmr_cb(struct timer_list *t);
-void llc_conn_ack_tmr_cb(struct timer_list *t);
-void llc_conn_rej_tmr_cb(struct timer_list *t);
-
-void llc_conn_set_p_flag(struct sock *sk, u8 value);
-#endif /* LLC_C_AC_H */
diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
deleted file mode 100644
index d45140d4289a..000000000000
--- a/include/net/llc_c_ev.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_C_EV_H
-#define LLC_C_EV_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- *		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-
-#include <net/sock.h>
-
-/* Connection component state transition event qualifiers */
-/* Types of events (possible values in 'ev->type') */
-#define LLC_CONN_EV_TYPE_SIMPLE		 1
-#define LLC_CONN_EV_TYPE_CONDITION	 2
-#define LLC_CONN_EV_TYPE_PRIM		 3
-#define LLC_CONN_EV_TYPE_PDU		 4	/* command/response PDU */
-#define LLC_CONN_EV_TYPE_ACK_TMR	 5
-#define LLC_CONN_EV_TYPE_P_TMR		 6
-#define LLC_CONN_EV_TYPE_REJ_TMR	 7
-#define LLC_CONN_EV_TYPE_BUSY_TMR	 8
-#define LLC_CONN_EV_TYPE_RPT_STATUS	 9
-#define LLC_CONN_EV_TYPE_SENDACK_TMR	10
-
-#define NBR_CONN_EV		   5
-/* Connection events which cause state transitions when fully qualified */
-
-#define LLC_CONN_EV_CONN_REQ				 1
-#define LLC_CONN_EV_CONN_RESP				 2
-#define LLC_CONN_EV_DATA_REQ				 3
-#define LLC_CONN_EV_DISC_REQ				 4
-#define LLC_CONN_EV_RESET_REQ				 5
-#define LLC_CONN_EV_RESET_RESP				 6
-#define LLC_CONN_EV_LOCAL_BUSY_DETECTED			 7
-#define LLC_CONN_EV_LOCAL_BUSY_CLEARED			 8
-#define LLC_CONN_EV_RX_BAD_PDU				 9
-#define LLC_CONN_EV_RX_DISC_CMD_Pbit_SET_X		10
-#define LLC_CONN_EV_RX_DM_RSP_Fbit_SET_X		11
-#define LLC_CONN_EV_RX_FRMR_RSP_Fbit_SET_X		12
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_X			13
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_X_UNEXPD_Ns	14
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_X_INVAL_Ns	15
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_X			16
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_X_UNEXPD_Ns	17
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_X_INVAL_Ns	18
-#define LLC_CONN_EV_RX_REJ_CMD_Pbit_SET_X		19
-#define LLC_CONN_EV_RX_REJ_RSP_Fbit_SET_X		20
-#define LLC_CONN_EV_RX_RNR_CMD_Pbit_SET_X		21
-#define LLC_CONN_EV_RX_RNR_RSP_Fbit_SET_X		22
-#define LLC_CONN_EV_RX_RR_CMD_Pbit_SET_X		23
-#define LLC_CONN_EV_RX_RR_RSP_Fbit_SET_X		24
-#define LLC_CONN_EV_RX_SABME_CMD_Pbit_SET_X		25
-#define LLC_CONN_EV_RX_UA_RSP_Fbit_SET_X		26
-#define LLC_CONN_EV_RX_XXX_CMD_Pbit_SET_X		27
-#define LLC_CONN_EV_RX_XXX_RSP_Fbit_SET_X		28
-#define LLC_CONN_EV_RX_XXX_YYY				29
-#define LLC_CONN_EV_RX_ZZZ_CMD_Pbit_SET_X_INVAL_Nr	30
-#define LLC_CONN_EV_RX_ZZZ_RSP_Fbit_SET_X_INVAL_Nr	31
-#define LLC_CONN_EV_P_TMR_EXP				32
-#define LLC_CONN_EV_ACK_TMR_EXP				33
-#define LLC_CONN_EV_REJ_TMR_EXP				34
-#define LLC_CONN_EV_BUSY_TMR_EXP			35
-#define LLC_CONN_EV_RX_XXX_CMD_Pbit_SET_1		36
-#define LLC_CONN_EV_RX_XXX_CMD_Pbit_SET_0		37
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_0_UNEXPD_Ns	38
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_0_UNEXPD_Ns	39
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_1_UNEXPD_Ns	40
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_1_UNEXPD_Ns	41
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_0			42
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_0			43
-#define LLC_CONN_EV_RX_I_CMD_Pbit_SET_1			44
-#define LLC_CONN_EV_RX_RR_CMD_Pbit_SET_0		45
-#define LLC_CONN_EV_RX_RR_RSP_Fbit_SET_0		46
-#define LLC_CONN_EV_RX_RR_RSP_Fbit_SET_1		47
-#define LLC_CONN_EV_RX_RR_CMD_Pbit_SET_1		48
-#define LLC_CONN_EV_RX_RNR_CMD_Pbit_SET_0		49
-#define LLC_CONN_EV_RX_RNR_RSP_Fbit_SET_0		50
-#define LLC_CONN_EV_RX_RNR_RSP_Fbit_SET_1		51
-#define LLC_CONN_EV_RX_RNR_CMD_Pbit_SET_1		52
-#define LLC_CONN_EV_RX_REJ_CMD_Pbit_SET_0		53
-#define LLC_CONN_EV_RX_REJ_RSP_Fbit_SET_0		54
-#define LLC_CONN_EV_RX_REJ_CMD_Pbit_SET_1		55
-#define LLC_CONN_EV_RX_I_RSP_Fbit_SET_1			56
-#define LLC_CONN_EV_RX_REJ_RSP_Fbit_SET_1		57
-#define LLC_CONN_EV_RX_XXX_RSP_Fbit_SET_1		58
-#define LLC_CONN_EV_TX_BUFF_FULL			59
-
-#define LLC_CONN_EV_INIT_P_F_CYCLE			100
-/*
- * Connection event qualifiers; for some events a certain combination of
- * these qualifiers must be TRUE before event recognized valid for state;
- * these constants act as indexes into the Event Qualifier function
- * table
- */
-#define LLC_CONN_EV_QFY_DATA_FLAG_EQ_1		 1
-#define LLC_CONN_EV_QFY_DATA_FLAG_EQ_0		 2
-#define LLC_CONN_EV_QFY_DATA_FLAG_EQ_2		 3
-#define LLC_CONN_EV_QFY_P_FLAG_EQ_1		 4
-#define LLC_CONN_EV_QFY_P_FLAG_EQ_0		 5
-#define LLC_CONN_EV_QFY_P_FLAG_EQ_Fbit		 6
-#define LLC_CONN_EV_QFY_REMOTE_BUSY_EQ_0	 7
-#define LLC_CONN_EV_QFY_RETRY_CNT_LT_N2		 8
-#define LLC_CONN_EV_QFY_RETRY_CNT_GTE_N2	 9
-#define LLC_CONN_EV_QFY_S_FLAG_EQ_1		10
-#define LLC_CONN_EV_QFY_S_FLAG_EQ_0		11
-#define LLC_CONN_EV_QFY_INIT_P_F_CYCLE		12
-
-struct llc_conn_state_ev {
-	u8 type;
-	u8 prim;
-	u8 prim_type;
-	u8 reason;
-	u8 status;
-	u8 ind_prim;
-	u8 cfm_prim;
-};
-
-static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
-{
-	return (struct llc_conn_state_ev *)skb->cb;
-}
-
-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
-
-int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_disc_req(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rst_req(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_local_busy_detected(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_local_busy_cleared(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_bad_pdu(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_disc_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_dm_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_frmr_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_i_cmd_pbit_set_x_inval_ns(struct sock *sk,
-					     struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_x_unexpd_ns(struct sock *sk,
-					      struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_x_inval_ns(struct sock *sk,
-					     struct sk_buff *skb);
-int llc_conn_ev_rx_rej_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_sabme_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_ua_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_xxx_cmd_pbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_xxx_rsp_fbit_set_x(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_zzz_cmd_pbit_set_x_inval_nr(struct sock *sk,
-					       struct sk_buff *skb);
-int llc_conn_ev_rx_zzz_rsp_fbit_set_x_inval_nr(struct sock *sk,
-					       struct sk_buff *skb);
-int llc_conn_ev_p_tmr_exp(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_ack_tmr_exp(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rej_tmr_exp(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_busy_tmr_exp(struct sock *sk, struct sk_buff *skb);
-/* NOT_USED functions and their variations */
-int llc_conn_ev_rx_xxx_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_xxx_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_i_cmd_pbit_set_0_unexpd_ns(struct sock *sk,
-					      struct sk_buff *skb);
-int llc_conn_ev_rx_i_cmd_pbit_set_1_unexpd_ns(struct sock *sk,
-					      struct sk_buff *skb);
-int llc_conn_ev_rx_i_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_i_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_0_unexpd_ns(struct sock *sk,
-					      struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_1_unexpd_ns(struct sock *sk,
-					      struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_i_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rnr_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rnr_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rnr_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rnr_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rej_cmd_pbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rej_cmd_pbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rej_rsp_fbit_set_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_rej_rsp_fbit_set_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_rx_any_frame(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_tx_buffer_full(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_init_p_f_cycle(struct sock *sk, struct sk_buff *skb);
-
-/* Available connection action qualifiers */
-int llc_conn_ev_qlfy_data_flag_eq_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_data_flag_eq_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_data_flag_eq_2(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_p_flag_eq_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_last_frame_eq_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_last_frame_eq_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_p_flag_eq_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_p_flag_eq_f(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_remote_busy_eq_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_remote_busy_eq_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_retry_cnt_lt_n2(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_retry_cnt_gte_n2(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_s_flag_eq_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_s_flag_eq_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_cause_flag_eq_1(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_cause_flag_eq_0(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_conn(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_disc(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_failed(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_remote_busy(struct sock *sk,
-					    struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_refuse(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_conflict(struct sock *sk, struct sk_buff *skb);
-int llc_conn_ev_qlfy_set_status_rst_done(struct sock *sk, struct sk_buff *skb);
-
-static __inline__ int llc_conn_space(struct sock *sk, struct sk_buff *skb)
-{
-	return atomic_read(&sk->sk_rmem_alloc) + skb->truesize <
-	       (unsigned int)sk->sk_rcvbuf;
-}
-#endif /* LLC_C_EV_H */
diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
deleted file mode 100644
index f52a4cc4880d..000000000000
--- a/include/net/llc_c_st.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_C_ST_H
-#define LLC_C_ST_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- *		2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-
-#include <net/llc_c_ac.h>
-#include <net/llc_c_ev.h>
-
-/* Connection component state management */
-/* connection states */
-#define LLC_CONN_OUT_OF_SVC		 0	/* prior to allocation */
- 
-#define LLC_CONN_STATE_ADM		 1	/* disc, initial state */
-#define LLC_CONN_STATE_SETUP		 2	/* disconnected state */
-#define LLC_CONN_STATE_NORMAL		 3	/* connected state */
-#define LLC_CONN_STATE_BUSY		 4	/* connected state */
-#define LLC_CONN_STATE_REJ		 5	/* connected state */
-#define LLC_CONN_STATE_AWAIT		 6	/* connected state */
-#define LLC_CONN_STATE_AWAIT_BUSY	 7	/* connected state */
-#define LLC_CONN_STATE_AWAIT_REJ	 8	/* connected state */
-#define LLC_CONN_STATE_D_CONN		 9	/* disconnected state */
-#define LLC_CONN_STATE_RESET		10	/* disconnected state */
-#define LLC_CONN_STATE_ERROR		11	/* disconnected state */
-#define LLC_CONN_STATE_TEMP		12	/* disconnected state */
-
-#define NBR_CONN_STATES			12	/* size of state table */
-#define NO_STATE_CHANGE			100
-
-/* Connection state table structure */
-struct llc_conn_state_trans {
-	llc_conn_ev_t	   ev;
-	u8		   next_state;
-	const llc_conn_ev_qfyr_t *ev_qualifiers;
-	const llc_conn_action_t  *ev_actions;
-};
-
-struct llc_conn_state {
-	u8				  current_state;
-	const struct llc_conn_state_trans **transitions;
-};
-
-extern struct llc_conn_state llc_conn_state_table[];
-#endif /* LLC_C_ST_H */
diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h
deleted file mode 100644
index e1a302696723..000000000000
--- a/include/net/llc_conn.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_CONN_H
-#define LLC_CONN_H
-/*
- * Copyright (c) 1997 by Procom Technology, Inc.
- * 		 2001, 2002 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-#include <linux/timer.h>
-#include <net/llc_if.h>
-#include <net/sock.h>
-#include <linux/llc.h>
-
-#define LLC_EVENT                1
-#define LLC_PACKET               2
-
-#define LLC2_P_TIME               2
-#define LLC2_ACK_TIME             1
-#define LLC2_REJ_TIME             3
-#define LLC2_BUSY_TIME            3
-
-struct llc_timer {
-	struct timer_list timer;
-	unsigned long	  expire;	/* timer expire time */
-};
-
-struct llc_sock {
-	/* struct sock must be the first member of llc_sock */
-	struct sock	    sk;
-	struct sockaddr_llc addr;		/* address sock is bound to */
-	u8		    state;		/* state of connection */
-	struct llc_sap	    *sap;		/* pointer to parent SAP */
-	struct llc_addr	    laddr;		/* lsap/mac pair */
-	struct llc_addr	    daddr;		/* dsap/mac pair */
-	struct net_device   *dev;		/* device to send to remote */
-	netdevice_tracker   dev_tracker;
-	u32		    copied_seq;		/* head of yet unread data */
-	u8		    retry_count;	/* number of retries */
-	u8		    ack_must_be_send;
-	u8		    first_pdu_Ns;
-	u8		    npta;
-	struct llc_timer    ack_timer;
-	struct llc_timer    pf_cycle_timer;
-	struct llc_timer    rej_sent_timer;
-	struct llc_timer    busy_state_timer;	/* ind busy clr at remote LLC */
-	u8		    vS;			/* seq# next in-seq I-PDU tx'd*/
-	u8		    vR;			/* seq# next in-seq I-PDU rx'd*/
-	u32		    n2;			/* max nbr re-tx's for timeout*/
-	u32		    n1;			/* max nbr octets in I PDU */
-	u8		    k;			/* tx window size; max = 127 */
-	u8		    rw;			/* rx window size; max = 127 */
-	u8		    p_flag;		/* state flags */
-	u8		    f_flag;
-	u8		    s_flag;
-	u8		    data_flag;
-	u8		    remote_busy_flag;
-	u8		    cause_flag;
-	struct sk_buff_head pdu_unack_q;	/* PUDs sent/waiting ack */
-	u16		    link;		/* network layer link number */
-	u8		    X;			/* a temporary variable */
-	u8		    ack_pf;		/* this flag indicates what is
-						   the P-bit of acknowledge */
-	u8		    failed_data_req; /* recognize that already exist a
-						failed llc_data_req_handler
-						(tx_buffer_full or unacceptable
-						state */
-	u8		    dec_step;
-	u8		    inc_cntr;
-	u8		    dec_cntr;
-	u8		    connect_step;
-	u8		    last_nr;	   /* NR of last pdu received */
-	u32		    rx_pdu_hdr;	   /* used for saving header of last pdu
-					      received and caused sending FRMR.
-					      Used for resending FRMR */
-	u32		    cmsg_flags;
-	struct hlist_node   dev_hash_node;
-};
-
-static inline struct llc_sock *llc_sk(const struct sock *sk)
-{
-	return (struct llc_sock *)sk;
-}
-
-static __inline__ void llc_set_backlog_type(struct sk_buff *skb, char type)
-{
-	skb->cb[sizeof(skb->cb) - 1] = type;
-}
-
-static __inline__ char llc_backlog_type(struct sk_buff *skb)
-{
-	return skb->cb[sizeof(skb->cb) - 1];
-}
-
-struct sock *llc_sk_alloc(struct net *net, int family, gfp_t priority,
-			  struct proto *prot, int kern);
-void llc_sk_stop_all_timers(struct sock *sk, bool sync);
-void llc_sk_free(struct sock *sk);
-
-void llc_sk_reset(struct sock *sk);
-
-/* Access to a connection */
-int llc_conn_state_process(struct sock *sk, struct sk_buff *skb);
-void llc_conn_send_pdu(struct sock *sk, struct sk_buff *skb);
-void llc_conn_rtn_pdu(struct sock *sk, struct sk_buff *skb);
-void llc_conn_resend_i_pdu_as_cmd(struct sock *sk, u8 nr, u8 first_p_bit);
-void llc_conn_resend_i_pdu_as_rsp(struct sock *sk, u8 nr, u8 first_f_bit);
-int llc_conn_remove_acked_pdus(struct sock *conn, u8 nr, u16 *how_many_unacked);
-struct sock *llc_lookup_established(struct llc_sap *sap, struct llc_addr *daddr,
-				    struct llc_addr *laddr, const struct net *net);
-void llc_sap_add_socket(struct llc_sap *sap, struct sock *sk);
-void llc_sap_remove_socket(struct llc_sap *sap, struct sock *sk);
-
-u8 llc_data_accept_state(u8 state);
-void llc_build_offset_table(void);
-#endif /* LLC_CONN_H */
diff --git a/include/net/llc_if.h b/include/net/llc_if.h
deleted file mode 100644
index a333259613ab..000000000000
--- a/include/net/llc_if.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_IF_H
-#define LLC_IF_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- * 		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-/* Defines LLC interface to network layer */
-/* Available primitives */
-#include <linux/if.h>
-#include <linux/if_arp.h>
-#include <linux/llc.h>
-#include <linux/etherdevice.h>
-#include <net/llc.h>
-
-#define LLC_DATAUNIT_PRIM	1
-#define LLC_CONN_PRIM		2
-#define LLC_DATA_PRIM		3
-#define LLC_DISC_PRIM		4
-#define LLC_RESET_PRIM		5
-#define LLC_FLOWCONTROL_PRIM	6 /* Not supported at this time */
-#define LLC_DISABLE_PRIM	7
-#define LLC_XID_PRIM		8
-#define LLC_TEST_PRIM		9
-#define LLC_SAP_ACTIVATION     10
-#define LLC_SAP_DEACTIVATION   11
-
-#define LLC_NBR_PRIMITIVES     11
-
-#define LLC_IND			1
-#define LLC_CONFIRM		2
-
-/* Primitive type */
-#define LLC_PRIM_TYPE_REQ	1
-#define LLC_PRIM_TYPE_IND	2
-#define LLC_PRIM_TYPE_RESP	3
-#define LLC_PRIM_TYPE_CONFIRM	4
-
-/* Reset reasons, remote entity or local LLC */
-#define LLC_RESET_REASON_REMOTE	1
-#define LLC_RESET_REASON_LOCAL	2
-
-/* Disconnect reasons */
-#define LLC_DISC_REASON_RX_DM_RSP_PDU	0
-#define LLC_DISC_REASON_RX_DISC_CMD_PDU	1
-#define LLC_DISC_REASON_ACK_TMR_EXP	2
-
-/* Confirm reasons */
-#define LLC_STATUS_CONN		0 /* connect confirm & reset confirm */
-#define LLC_STATUS_DISC		1 /* connect confirm & reset confirm */
-#define LLC_STATUS_FAILED	2 /* connect confirm & reset confirm */
-#define LLC_STATUS_IMPOSSIBLE	3 /* connect confirm */
-#define LLC_STATUS_RECEIVED	4 /* data conn */
-#define LLC_STATUS_REMOTE_BUSY	5 /* data conn */
-#define LLC_STATUS_REFUSE	6 /* data conn */
-#define LLC_STATUS_CONFLICT	7 /* disconnect conn */
-#define LLC_STATUS_RESET_DONE	8 /*  */
-
-int llc_establish_connection(struct sock *sk, const u8 *lmac, u8 *dmac,
-			     u8 dsap);
-int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb);
-int llc_send_disc(struct sock *sk);
-#endif /* LLC_IF_H */
diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
deleted file mode 100644
index 076adc5217fd..000000000000
--- a/include/net/llc_s_ac.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_S_AC_H
-#define LLC_S_AC_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- * 		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-
-struct llc_sap;
-struct sk_buff;
-
-/* SAP component actions */
-#define SAP_ACT_UNITDATA_IND	1
-#define SAP_ACT_SEND_UI		2
-#define SAP_ACT_SEND_XID_C	3
-#define SAP_ACT_SEND_XID_R	4
-#define SAP_ACT_SEND_TEST_C	5
-#define SAP_ACT_SEND_TEST_R	6
-#define SAP_ACT_REPORT_STATUS	7
-#define SAP_ACT_XID_IND		8
-#define SAP_ACT_TEST_IND	9
-
-/* All action functions must look like this */
-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
-
-int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_send_xid_c(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_send_xid_r(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_send_test_c(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_send_test_r(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_report_status(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_xid_ind(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_action_test_ind(struct llc_sap *sap, struct sk_buff *skb);
-#endif /* LLC_S_AC_H */
diff --git a/include/net/llc_s_ev.h b/include/net/llc_s_ev.h
deleted file mode 100644
index 7b9c94093336..000000000000
--- a/include/net/llc_s_ev.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_S_EV_H
-#define LLC_S_EV_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- * 		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-
-#include <linux/skbuff.h>
-#include <net/llc.h>
-
-/* Defines SAP component events */
-/* Types of events (possible values in 'ev->type') */
-#define LLC_SAP_EV_TYPE_SIMPLE		1
-#define LLC_SAP_EV_TYPE_CONDITION	2
-#define LLC_SAP_EV_TYPE_PRIM		3
-#define LLC_SAP_EV_TYPE_PDU		4   /* command/response PDU */
-#define LLC_SAP_EV_TYPE_ACK_TMR		5
-#define LLC_SAP_EV_TYPE_RPT_STATUS	6
-
-#define LLC_SAP_EV_ACTIVATION_REQ	 1
-#define LLC_SAP_EV_RX_UI		 2
-#define LLC_SAP_EV_UNITDATA_REQ		 3
-#define LLC_SAP_EV_XID_REQ		 4
-#define LLC_SAP_EV_RX_XID_C		 5
-#define LLC_SAP_EV_RX_XID_R		 6
-#define LLC_SAP_EV_TEST_REQ		 7
-#define LLC_SAP_EV_RX_TEST_C		 8
-#define LLC_SAP_EV_RX_TEST_R		 9
-#define LLC_SAP_EV_DEACTIVATION_REQ	10
-
-struct llc_sap_state_ev {
-	u8		prim;
-	u8		prim_type;
-	u8		type;
-	u8		reason;
-	u8		ind_cfm_flag;
-	struct llc_addr saddr;
-	struct llc_addr daddr;
-};
-
-static __inline__ struct llc_sap_state_ev *llc_sap_ev(struct sk_buff *skb)
-{
-	return (struct llc_sap_state_ev *)skb->cb;
-}
-
-struct llc_sap;
-
-typedef int (*llc_sap_ev_t)(struct llc_sap *sap, struct sk_buff *skb);
-
-int llc_sap_ev_activation_req(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_rx_ui(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_unitdata_req(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_xid_req(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_rx_xid_c(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_rx_xid_r(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_test_req(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_rx_test_c(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_rx_test_r(struct llc_sap *sap, struct sk_buff *skb);
-int llc_sap_ev_deactivation_req(struct llc_sap *sap, struct sk_buff *skb);
-#endif /* LLC_S_EV_H */
diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
deleted file mode 100644
index 85ce230fd946..000000000000
--- a/include/net/llc_s_st.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_S_ST_H
-#define LLC_S_ST_H
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- * 		 2001 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-
-#include <linux/types.h>
-#include <net/llc_s_ac.h>
-#include <net/llc_s_ev.h>
-
-struct llc_sap_state_trans;
-
-#define LLC_NR_SAP_STATES	2       /* size of state table */
-
-/* structures and types */
-/* SAP state table structure */
-struct llc_sap_state_trans {
-	llc_sap_ev_t	  ev;
-	u8		  next_state;
-	const llc_sap_action_t *ev_actions;
-};
-
-struct llc_sap_state {
-	u8				 curr_state;
-	const struct llc_sap_state_trans **transitions;
-};
-
-/* only access to SAP state table */
-extern struct llc_sap_state llc_sap_state_table[LLC_NR_SAP_STATES];
-#endif /* LLC_S_ST_H */
diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h
deleted file mode 100644
index b259f5993c46..000000000000
--- a/include/net/llc_sap.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef LLC_SAP_H
-#define LLC_SAP_H
-
-#include <asm/types.h>
-
-/*
- * Copyright (c) 1997 by Procom Technology,Inc.
- * 		 2001-2003 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
- */
-struct llc_sap;
-struct net_device;
-struct sk_buff;
-struct sock;
-
-void llc_sap_rtn_pdu(struct llc_sap *sap, struct sk_buff *skb);
-void llc_save_primitive(struct sock *sk, struct sk_buff *skb,
-			unsigned char prim);
-struct sk_buff *llc_alloc_frame(struct sock *sk, struct net_device *dev,
-				u8 type, u32 data_size);
-
-void llc_build_and_send_test_pkt(struct llc_sap *sap, struct sk_buff *skb,
-				 unsigned char *dmac, unsigned char dsap);
-void llc_build_and_send_xid_pkt(struct llc_sap *sap, struct sk_buff *skb,
-				unsigned char *dmac, unsigned char dsap);
-#endif /* LLC_SAP_H */