[LLC] remove all tmr ev structs & fix psnap and p8022 wrt ui sending

. No need for the timer_running member on llc_timer,
  we only need it in one place, and timer_pending is
  equivalent. One more procom OS generalisation killed.
. Move the skb->protocol assignment in llc_build_and_send_pkt
  routines and llc_ui_send_data to the caller, this is the common
  practice in Linux networking code (think netif_rx) and required
  to keep the request functions in psnap and p8022 simple.
. Remove the rpt_status (report status) ev members, not
  used at all, not even in the original procom code.
. Convert psnap and p8022 request functions to use
  llc_ui_build_and_send_ui_pkt, removing all the prim cruft.

7 files changed, 7 insertions, 58 deletions

diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
index 44261460c560..5fe315ebcc7c 100644
--- a/include/net/llc_c_ev.h
+++ b/include/net/llc_c_ev.h
@@ -122,27 +122,14 @@ struct llc_conn_ev_prim_if {
 
 /* Event LLC_CONN_EV_TYPE_PDU interface */
 struct llc_conn_ev_pdu_if {
-	u8		ev;
-	u8		reason;
-};
-
-/* Event interface for timer-generated events */
-struct llc_conn_ev_tmr_if {
-	struct sock *sk;
-	u32	     component_handle;
-	void	    *timer_specific;
-};
-
-struct llc_conn_ev_rpt_sts_if {
-	u8 status;
+	u8 ev;
+	u8 reason;
 };
 
 union llc_conn_ev_if {
 	struct llc_conn_ev_simple_if  a;	/* 'a' for simple, easy ... */
 	struct llc_conn_ev_prim_if    prim;
 	struct llc_conn_ev_pdu_if     pdu;
-	struct llc_conn_ev_tmr_if     tmr;
-	struct llc_conn_ev_rpt_sts_if rsts;	/* report status */
 };
 
 struct llc_conn_state_ev {
diff --git a/include/net/llc_conn.h b/include/net/llc_conn.h
index 5846a5b91841..ac0a2bb7aa22 100644
--- a/include/net/llc_conn.h
+++ b/include/net/llc_conn.h
@@ -17,7 +17,6 @@
 
 struct llc_timer {
 	struct timer_list timer;
-	u8		  running;	/* timer is running or no */
 	u16		  expire;	/* timer expire time */
 };
 
diff --git a/include/net/llc_evnt.h b/include/net/llc_evnt.h
index 7029489d5f9e..b521be2a5582 100644
--- a/include/net/llc_evnt.h
+++ b/include/net/llc_evnt.h
@@ -43,29 +43,18 @@ struct llc_stat_ev_prim_if {
 
 struct llc_stat_ev_pdu_if {
 	u8 reason;
-	struct sk_buff *skb;
-};
-
-struct llc_stat_ev_tmr_if {
-	void *timer_specific;
-};
-
-struct llc_stat_ev_rpt_sts_if {
-	u8 status;
 };
 
 union llc_stat_ev_if {
 	struct llc_stat_ev_simple_if  a;	/* 'a' for simple, easy ... */
 	struct llc_stat_ev_prim_if    prim;
 	struct llc_stat_ev_pdu_if     pdu;
-	struct llc_stat_ev_tmr_if     tmr;
-	struct llc_stat_ev_rpt_sts_if rsts;	/* report status */
 };
 
 struct llc_station_state_ev {
-	u8			type;
+	u8		     type;
 	union llc_stat_ev_if data;
-	struct list_head	node; /* node in station->ev_q.list */
+	struct list_head     node; /* node in station->ev_q.list */
 };
 
 static __inline__ struct llc_station_state_ev *
diff --git a/include/net/llc_if.h b/include/net/llc_if.h
index e17373a17c00..b6f50717dd5c 100644
--- a/include/net/llc_if.h
+++ b/include/net/llc_if.h
@@ -122,24 +122,12 @@ extern int llc_establish_connection(struct sock *sk, u8 *lmac,
 extern int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb);
 extern void llc_build_and_send_ui_pkt(struct llc_sap *sap,
 				      struct sk_buff *skb,
-				      struct sockaddr_llc *addr);
+				      u8 *dmac, u8 dsap);
 extern void llc_build_and_send_xid_pkt(struct llc_sap *sap,
 				       struct sk_buff *skb,
-				       struct sockaddr_llc *addr);
+				       u8 *dmac, u8 dsap);
 extern void llc_build_and_send_test_pkt(struct llc_sap *sap,
 					struct sk_buff *skb,
-					struct sockaddr_llc *addr);
+					u8 *dmac, u8 dsap);
 extern int llc_send_disc(struct sock *sk);
-
-/**
- *	llc_proto_type - return eth protocol for ARP header type
- *	@arphrd: ARP header type.
- *
- *	Given an ARP header type return the corresponding ethernet protocol.
- */
-static __inline__ u16 llc_proto_type(u16 arphrd)
-{
-	return arphrd == ARPHRD_IEEE802_TR ?
-			 htons(ETH_P_TR_802_2) : htons(ETH_P_802_2);
-}
 #endif /* LLC_IF_H */
diff --git a/include/net/llc_main.h b/include/net/llc_main.h
index 31810831fceb..e3b0c7a09caa 100644
--- a/include/net/llc_main.h
+++ b/include/net/llc_main.h
@@ -30,7 +30,6 @@
  *
  * @state - state of station
  * @xid_r_count - XID response PDU counter
- * @ack_tmr_running - 1 or 0
  * @mac_sa - MAC source address
  * @sap_list - list of related SAPs
  * @ev_q - events entering state mach.
@@ -40,7 +39,6 @@ struct llc_station {
 	u8			    state;
 	u8			    xid_r_count;
 	struct timer_list	    ack_timer;
-	u8			    ack_tmr_running;
 	u8			    retry_count;
 	u8			    maximum_retry;
 	u8			    mac_sa[6];
diff --git a/include/net/llc_s_ev.h b/include/net/llc_s_ev.h
index 6127f960a986..c1f124f9d3c8 100644
--- a/include/net/llc_s_ev.h
+++ b/include/net/llc_s_ev.h
@@ -52,20 +52,10 @@ struct llc_sap_ev_pdu_if {
 	u8 reason;
 };
 
-struct llc_sap_ev_tmr_if {
-	void *timer_specific;
-};
-
-struct llc_sap_ev_rpt_sts_if {
-	u8 status;
-};
-
 union llc_sap_ev_if {
 	struct llc_sap_ev_simple_if	a;	/* 'a' for simple, easy ... */
 	struct llc_sap_ev_prim_if	prim;
 	struct llc_sap_ev_pdu_if	pdu;
-	struct llc_sap_ev_tmr_if	tmr;
-	struct llc_sap_ev_rpt_sts_if	rsts;	/* report status */
 };
 
 struct llc_prim_if_block;
diff --git a/include/net/llc_sap.h b/include/net/llc_sap.h
index 3132bebd1422..412798ab6c0e 100644
--- a/include/net/llc_sap.h
+++ b/include/net/llc_sap.h
@@ -17,7 +17,6 @@
  *
  * @p_bit - only lowest-order bit used
  * @f_bit - only lowest-order bit used
- * @req - provided by LLC layer
  * @ind - provided by network layer
  * @conf - provided by network layer
  * @laddr - SAP value in this 'lsap'
@@ -30,7 +29,6 @@ struct llc_sap {
 	u8			 state;
 	u8			 p_bit;
 	u8			 f_bit;
-	llc_prim_call_t		 req;
 	llc_prim_call_t		 ind;
 	llc_prim_call_t		 conf;
 	struct llc_prim_if_block llc_ind_prim, llc_cfm_prim;