[LLC] llc_establish_connection & LLC_CONN_PRIM bits the bucket

. Bzzzt, rest in peace LLC_DATA_PRIM. We won't miss you.
. In the process I also killed sap->resp and all of the
  functions it was calling, the Procom guys left this in
  the codebase but _nobody_ was actually using it.

include/net/llc_if.h

@@ -66,17 +66,6 @@ struct llc_addr {
 };
 
 /* Primitive-specific data */
-struct llc_prim_conn {
-	struct llc_addr	   saddr;	/* used by request only */
-	struct llc_addr	   daddr;	/* used by request only */
-	u8		   status;	/* reason for failure */
-	u8		   pri;		/* service_class */
-	struct net_device *dev;
-	struct sock	  *sk;		/* returned from REQUEST */
-	u16		   link;
-	struct sk_buff	  *skb;		/* received SABME  */
-};
-
 struct llc_prim_disc {
 	struct sock *sk;
 	u16	     link;
@@ -119,7 +108,6 @@ struct llc_prim_test {
 };
 
 union llc_u_prim_data {
-	struct llc_prim_conn	  conn;
 	struct llc_prim_disc	  disc;
 	struct llc_prim_reset	  res;
 	struct llc_prim_flow_ctrl fc;
@@ -142,5 +130,7 @@ extern struct llc_sap *llc_sap_open(llc_prim_call_t network_indicate,
 				    llc_prim_call_t network_confirm, u8 lsap);
 extern void llc_sap_close(struct llc_sap *sap);
 
+extern int llc_establish_connection(struct sock *sk, u8 *lmac,
+				    u8 *dmac, u8 dsap);
 extern int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb);
 #endif /* LLC_IF_H */

include/net/llc_sap.h

@@ -18,7 +18,6 @@
  * @p_bit - only lowest-order bit used
  * @f_bit - only lowest-order bit used
  * @req - provided by LLC layer
- * @resp - provided by LLC layer
  * @ind - provided by network layer
  * @conf - provided by network layer
  * @laddr - SAP value in this 'lsap'
@@ -32,7 +31,6 @@ struct llc_sap {
 	u8			 p_bit;
 	u8			 f_bit;
 	llc_prim_call_t		 req;
-	llc_prim_call_t		 resp;
 	llc_prim_call_t		 ind;
 	llc_prim_call_t		 conf;
 	struct llc_prim_if_block llc_ind_prim, llc_cfm_prim;

net/llc/llc_c_ac.c

@@ -81,21 +81,9 @@ 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)
 {
 	struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-	struct llc_opt *llc = llc_sk(sk);
-	struct llc_sap *sap = llc->sap;
-	struct llc_prim_if_block *prim = &sap->llc_cfm_prim;
-	union llc_u_prim_data *prim_data = prim->data;
 
-	prim_data->conn.sk     = sk;
-	prim_data->conn.pri    = 0;
-	prim_data->conn.status = ev->status;
-	prim_data->conn.link   = llc->link;
-	prim_data->conn.dev    = skb->dev;
-	prim->data   = prim_data;
-	prim->prim   = LLC_CONN_PRIM;
-	prim->sap    = sap;
-	ev->flag     = 1;
-	ev->cfm_prim = prim;
+	ev->flag     = LLC_CONN_PRIM + 1;
+	ev->cfm_prim = (void *)1;
 	return 0;
 }
 
@@ -1451,6 +1439,7 @@ void llc_conn_pf_cycle_tmr_cb(unsigned long timeout_data)
 	if (skb) {
 		struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
+		skb->sk  = sk;
 		ev->type = LLC_CONN_EV_TYPE_P_TMR;
 		ev->data.tmr.timer_specific = NULL;
 		llc_process_tmr_ev(sk, skb);
@@ -1468,6 +1457,7 @@ static void llc_conn_busy_tmr_cb(unsigned long timeout_data)
 	if (skb) {
 		struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
+		skb->sk  = sk;
 		ev->type = LLC_CONN_EV_TYPE_BUSY_TMR;
 		ev->data.tmr.timer_specific = NULL;
 		llc_process_tmr_ev(sk, skb);
@@ -1485,6 +1475,7 @@ void llc_conn_ack_tmr_cb(unsigned long timeout_data)
 	if (skb) {
 		struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
+		skb->sk  = sk;
 		ev->type = LLC_CONN_EV_TYPE_ACK_TMR;
 		ev->data.tmr.timer_specific = NULL;
 		llc_process_tmr_ev(sk, skb);
@@ -1502,6 +1493,7 @@ static void llc_conn_rej_tmr_cb(unsigned long timeout_data)
 	if (skb) {
 		struct llc_conn_state_ev *ev = llc_conn_ev(skb);
 
+		skb->sk  = sk;
 		ev->type = LLC_CONN_EV_TYPE_REJ_TMR;
 		ev->data.tmr.timer_specific = NULL;
 		llc_process_tmr_ev(sk, skb);

net/llc/llc_conn.c

@@ -103,9 +103,23 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
 	}
 	if (!cfm_prim)  /* confirmation not required */
 		goto out;
-	/* data confirm has preconditions */
+	/* data and conn confirm have preconditions */
 	/* FIXME: see FIXMEs above */
-	if (flag != LLC_DATA_PRIM + 1) {
+	if (flag == LLC_CONN_PRIM + 1) {
+		struct sock *sk = skb->sk;
+
+		if (sk->type != SOCK_STREAM || sk->state != TCP_SYN_SENT)
+			goto out_kfree_skb;
+		if (ev->status) {
+			sk->socket->state = SS_UNCONNECTED;
+			sk->state         = TCP_CLOSE;
+		} else {
+			sk->socket->state = SS_CONNECTED;
+			sk->state         = TCP_ESTABLISHED;
+		}
+		sk->state_change(sk);
+		goto out_kfree_skb;
+	} else if (flag != LLC_DATA_PRIM + 1) {
 		llc->sap->conf(cfm_prim);
 		goto out;
 	}
@@ -115,6 +129,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
 			skb->sk->write_space(skb->sk);
 	} else
 		rc = llc->failed_data_req = 1;
+out_kfree_skb:
 	kfree_skb(skb);
 out:
 	return rc;

net/llc/llc_if.c

@@ -32,19 +32,14 @@ static int llc_sap_req(struct llc_prim_if_block *prim);
 static int llc_unitdata_req_handler(struct llc_prim_if_block *prim);
 static int llc_test_req_handler(struct llc_prim_if_block *prim);
 static int llc_xid_req_handler(struct llc_prim_if_block *prim);
-static int llc_conn_req_handler(struct llc_prim_if_block *prim);
 static int llc_disc_req_handler(struct llc_prim_if_block *prim);
 static int llc_rst_req_handler(struct llc_prim_if_block *prim);
 static int llc_flowcontrol_req_handler(struct llc_prim_if_block *prim);
-static int llc_sap_resp(struct llc_prim_if_block *prim);
-static int llc_conn_rsp_handler(struct llc_prim_if_block *prim);
-static int llc_rst_rsp_handler(struct llc_prim_if_block *prim);
-static int llc_no_rsp_handler(struct llc_prim_if_block *prim);
 
 /* table of request handler functions */
 static llc_prim_call_t llc_req_prim[LLC_NBR_PRIMITIVES] = {
 	[LLC_DATAUNIT_PRIM]	= llc_unitdata_req_handler,
-	[LLC_CONN_PRIM]		= llc_conn_req_handler,
+	[LLC_CONN_PRIM]		= NULL, /* replaced by + llc_establish_connection */
 	[LLC_DATA_PRIM]		= NULL, /* replaced by llc_build_and_send_pkt */
 	[LLC_DISC_PRIM]		= llc_disc_req_handler,
 	[LLC_RESET_PRIM]	= llc_rst_req_handler,
@@ -53,16 +48,6 @@ static llc_prim_call_t llc_req_prim[LLC_NBR_PRIMITIVES] = {
 	[LLC_TEST_PRIM]		= llc_test_req_handler,
 };
 
-/* table of response handler functions */
-static llc_prim_call_t llc_resp_prim[LLC_NBR_PRIMITIVES] = {
-	[LLC_DATAUNIT_PRIM]	= llc_no_rsp_handler,
-	[LLC_CONN_PRIM]		= llc_conn_rsp_handler,
-	[LLC_DATA_PRIM]		= llc_no_rsp_handler,
-	[LLC_DISC_PRIM]		= llc_no_rsp_handler,
-	[LLC_RESET_PRIM]	= llc_rst_rsp_handler,
-	[LLC_FLOWCONTROL_PRIM]	= llc_no_rsp_handler,
-};
-
 /**
  *	llc_sap_open - open interface to the upper layers.
  *	@nw_indicate: pointer to indicate function of upper layer.
@@ -93,7 +78,6 @@ struct llc_sap *llc_sap_open(llc_prim_call_t nw_indicate,
 	/* allocated a SAP; initialize it and clear out its memory pool */
 	sap->laddr.lsap = lsap;
 	sap->req = llc_sap_req;
-	sap->resp = llc_sap_resp;
 	sap->ind = nw_indicate;
 	sap->conf = nw_confirm;
 	sap->parent_station = llc_station_get();
@@ -273,21 +257,11 @@ int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)
 }
 
 /**
- *	llc_confirm_impossible - Informs upper layer about failed connection
- *	@prim: pointer to structure that contains confirmation data.
- *
- *	Informs upper layer about failing in connection establishment. This
- *	function is called by llc_conn_req_handler.
- */
-static void llc_confirm_impossible(struct llc_prim_if_block *prim)
-{
-	prim->data->conn.status = LLC_STATUS_IMPOSSIBLE;
-	prim->sap->conf(prim);
-}
-
-/**
- *	llc_conn_req_handler - Called by upper layer to establish a conn
- *	@prim: pointer to structure that contains service parameters.
+ *	llc_establish_connection - Called by upper layer to establish a conn
+ *	@sk: connection
+ *	@lmac: local mac address
+ *	@dmac: destination mac address
+ *	@dsap: destination sap
  *
  *	Upper layer calls this to establish an LLC connection with a remote
  *	machine. This function packages a proper event and sends it connection
@@ -295,37 +269,28 @@ static void llc_confirm_impossible(struct llc_prim_if_block *prim)
  *	establishment will inform to upper layer via calling it's confirm
  *	function and passing proper information.
  */
-static int llc_conn_req_handler(struct llc_prim_if_block *prim)
+int llc_establish_connection(struct sock *sk, u8 *lmac, u8 *dmac, u8 dsap)
 {
-	int rc = -EBUSY;
-	struct llc_sap *sap = prim->sap;
-	struct sk_buff *skb;
-	struct net_device *ddev = mac_dev_peer(prim->data->conn.dev,
-					       prim->data->conn.dev->type,
-					       prim->data->conn.daddr.mac),
-			  *sdev = (ddev->flags & IFF_LOOPBACK) ?
-				  ddev : prim->data->conn.dev;
+	int rc = -EISCONN;
 	struct llc_addr laddr, daddr;
-	/* network layer supplies addressing required to establish connection;
-	 * package as an event and send it to the connection event handler
-	 */
-	struct sock *sk;
-
-	memcpy(laddr.mac, sdev->dev_addr, sizeof(laddr.mac));
-	laddr.lsap = prim->data->conn.saddr.lsap;
-	memcpy(daddr.mac, prim->data->conn.daddr.mac, sizeof(daddr.mac));
-	daddr.lsap = prim->data->conn.daddr.lsap;
-	sk = llc_lookup_established(sap, &daddr, &laddr);
-	if (sk) {
-		if (sk->state == TCP_ESTABLISHED) {
-			llc_confirm_impossible(prim);
+	struct sk_buff *skb;
+	struct llc_opt *llc = llc_sk(sk);
+	struct sock *existing;
+
+	laddr.lsap = llc->sap->laddr.lsap;
+	daddr.lsap = dsap;
+	memcpy(daddr.mac, dmac, sizeof(daddr.mac));
+	memcpy(laddr.mac, lmac, sizeof(laddr.mac));
+	existing = llc_lookup_established(llc->sap, &daddr, &laddr);
+	if (existing) {
+		if (existing->state == TCP_ESTABLISHED) {
+			sk = existing;
 			goto out_put;
 		} else
-			sock_put(sk);
+			sock_put(existing);
 	}
-	rc = -ENOMEM;
-	sk = prim->data->conn.sk;
 	sock_hold(sk);
+	rc = -ENOMEM;
 	skb = alloc_skb(0, GFP_ATOMIC);
 	if (skb) {
 		struct llc_conn_state_ev *ev = llc_conn_ev(skb);
@@ -333,11 +298,9 @@ static int llc_conn_req_handler(struct llc_prim_if_block *prim)
 		ev->type	   = LLC_CONN_EV_TYPE_PRIM;
 		ev->data.prim.prim = LLC_CONN_PRIM;
 		ev->data.prim.type = LLC_PRIM_TYPE_REQ;
-		ev->data.prim.data = prim;
+		ev->data.prim.data = NULL;
 		rc = llc_conn_state_process(sk, skb);
 	}
-	if (rc)
-		llc_confirm_impossible(prim);
 out_put:
 	sock_put(sk);
 	return rc;
@@ -417,73 +380,5 @@ static int llc_flowcontrol_req_handler(struct llc_prim_if_block *prim)
 	return 1;
 }
 
-/**
- *	llc_sap_resp - Sends response to peer
- *	@prim: pointer to structure that contains service parameters
- *
- *	This function is a interface function to upper layer. Each one who
- *	wants to response to an indicate can call this function via calling
- *	sap_resp with proper service parameters. Returns 0 for success, 1
- *	otherwise.
- */
-static int llc_sap_resp(struct llc_prim_if_block *prim)
-{
-	u16 rc = 1;
-	/* network layer RESPONSE primitive received; package primitive
-	 * as an event and send it to the connection event handler
-	 */
-	if (prim->prim < LLC_NBR_PRIMITIVES)
-	       /* valid primitive; call the function to handle it */
-		rc = llc_resp_prim[prim->prim](prim);
-	return rc;
-}
-
-/**
- *	llc_conn_rsp_handler - Response to connect indication
- *	@prim: pointer to structure that contains response info.
- *
- *	Response to connect indication.
- */
-static int llc_conn_rsp_handler(struct llc_prim_if_block *prim)
-{
-	struct sock *sk = prim->data->conn.sk;
-
-	llc_sk(sk)->link = prim->data->conn.link;
-	return 0;
-}
-
-/**
- *	llc_rst_rsp_handler - Response to RESET indication
- *	@prim: pointer to structure that contains response info
- *
- *	Returns 0 for success, 1 otherwise
- */
-static int llc_rst_rsp_handler(struct llc_prim_if_block *prim)
-{
-	int rc = 1;
-	/*
-	 * Network layer supplies connection handle; map it to a connection;
-	 * package as event and send it to connection event handler
-	 */
-	struct sock *sk = prim->data->res.sk;
-	struct sk_buff *skb = alloc_skb(0, GFP_ATOMIC);
-
-	if (skb) {
-		struct llc_conn_state_ev *ev = llc_conn_ev(skb);
-
-		ev->type	   = LLC_CONN_EV_TYPE_PRIM;
-		ev->data.prim.prim = LLC_RESET_PRIM;
-		ev->data.prim.type = LLC_PRIM_TYPE_RESP;
-		ev->data.prim.data = prim;
-		rc = llc_conn_state_process(sk, skb);
-	}
-	return rc;
-}
-
-static int llc_no_rsp_handler(struct llc_prim_if_block *prim)
-{
-	return 0;
-}
-
 EXPORT_SYMBOL(llc_sap_open);
 EXPORT_SYMBOL(llc_sap_close);

net/llc/llc_sock.c

@@ -124,38 +124,6 @@ static __inline__ u8 llc_ui_header_len(struct sock *sk,
 	return rc;
 }
 
-/**
- *	llc_ui_send_conn - send connect command for new llc2 connection
- *	@sap : Sap the socket is bound to.
- *	@addr: Source and destination fields provided by the user.
- *	@dev : Device which this connection should use.
- *	@link: Link number to assign to this connection.
- *
- *	Send a connect command to the llc layer for a new llc2 connection.
- *	Returns 0 upon success, non-zero if action didn't succeed.
- */
-static int llc_ui_send_conn(struct sock *sk, struct llc_sap *sap,
-			    struct sockaddr_llc *addr,
-			    struct net_device *dev, int link)
-{
-	struct llc_opt *llc = llc_sk(sk);
-	union llc_u_prim_data prim_data;
-	struct llc_prim_if_block prim;
-
-	prim.data		= &prim_data;
-	prim.sap		= sap;
-	prim.prim		= LLC_CONN_PRIM;
-	prim_data.conn.dev	= dev;
-	prim_data.conn.link	= link;
-	prim_data.conn.sk	= sk;
-	prim_data.conn.pri	= 0;
-	prim_data.conn.saddr.lsap = llc->addr.sllc_ssap;
-	prim_data.conn.daddr.lsap = addr->sllc_dsap;
-	memcpy(prim_data.conn.saddr.mac, dev->dev_addr, IFHWADDRLEN);
-	memcpy(prim_data.conn.daddr.mac, addr->sllc_dmac, IFHWADDRLEN);
-	return sap->req(&prim);
-}
-
 /**
  *	llc_ui_send_disc - send disc command to llc layer
  *	@sk: Socket with valid llc information.
@@ -709,7 +677,8 @@ static int llc_ui_connect(struct socket *sock, struct sockaddr *uaddr,
 	sock->state = SS_CONNECTING;
 	sk->state   = TCP_SYN_SENT;
 	llc->link   = llc_ui_next_link_no(llc->sap->laddr.lsap);
-	rc = llc_ui_send_conn(sk, llc->sap, addr, dev, llc->link);
+	rc = llc_establish_connection(sk, dev->dev_addr,
+				      addr->sllc_dmac, addr->sllc_dsap);
 	if (rc) {
 		dprintk("%s: llc_ui_send_conn failed :-(\n", __FUNCTION__);
 		sock->state = SS_UNCONNECTED;
@@ -1440,32 +1409,6 @@ static int llc_ui_indicate(struct llc_prim_if_block *prim)
 	return 0;
 }
 
-/**
- *	llc_ui_conf_conn - handle CONN confirm.
- *	@prim: Primitive block provided by the llc layer.
- *
- *	handle CONN confirm.
- */
-static void llc_ui_conf_conn(struct llc_prim_if_block *prim)
-{
-	struct llc_prim_conn *prim_data = &prim->data->conn;
-	struct sock* sk = prim_data->sk;
-
-	sock_hold(sk);
-	if (sk->type != SOCK_STREAM || sk->state != TCP_SYN_SENT)
-		goto out_put;
-	if (!prim->data->conn.status) {
-		sk->socket->state = SS_CONNECTED;
-		sk->state	  = TCP_ESTABLISHED;
-	} else {
-		sk->socket->state = SS_UNCONNECTED;
-		sk->state	  = TCP_CLOSE;
-	}
-	sk->state_change(sk);
-out_put:
-	sock_put(sk);
-}
-
 /**
  *	llc_ui_conf_disc - handle DISC confirm.
  *	@prim: Primitive block provided by the llc layer.
@@ -1499,7 +1442,9 @@ static int llc_ui_confirm(struct llc_prim_if_block *prim)
 {
 	switch (prim->prim) {
 		case LLC_CONN_PRIM:
-			llc_ui_conf_conn(prim);		break;
+			dprintk("%s: shouldn't happen, LLC_CONN_PRIM "
+				"is gone for ->conf()...\n", __FUNCTION__);
+			break;
 		case LLC_DATA_PRIM:
 			dprintk("%s: shouldn't happen, LLC_DATA_PRIM "
 				"is gone for ->conf()...\n", __FUNCTION__);