LLC: llc_build_and_send_pkt

Rename llc_data_req_handler with llc_build_and_send_pkt, following my
plan to have LLC look more like TCP/IP and to slowly remove all the ugly
prim types and sap->{req,ind,conf}.

No problems with Appletalk up to now as it only uses UI and I'm up to
now only concentrating on connection mode, so that we can remove all
the duplicated work in core and PF_LLC.

include/net/llc_if.h

@@ -152,4 +152,6 @@ typedef int (*llc_prim_call_t)(struct llc_prim_if_block *prim_if);
 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_build_and_send_pkt(struct sock *sk, struct sk_buff *skb);
 #endif /* LLC_IF_H */

net/llc/llc_if.c

@@ -31,7 +31,6 @@ 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_data_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);
@@ -45,7 +44,7 @@ static int llc_no_rsp_handler(struct llc_prim_if_block *prim);
 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_DATA_PRIM]		= llc_data_req_handler,
+	[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,
 	[LLC_FLOWCONTROL_PRIM]	= llc_flowcontrol_req_handler,
@@ -233,7 +232,7 @@ static int llc_xid_req_handler(struct llc_prim_if_block *prim)
 }
 
 /**
- *	llc_data_req_handler - Connection data sending for upper layers.
+ *	llc_build_and_send_pkt - Connection data sending for upper layers.
  *	@prim: pointer to structure that contains service parameters
  *
  *	This function is called when upper layer wants to send data using
@@ -244,15 +243,10 @@ static int llc_xid_req_handler(struct llc_prim_if_block *prim)
  *	LLC has send an I pdu with p bit set to 1 and is waiting for it's
  *	response.
  */
-static int llc_data_req_handler(struct llc_prim_if_block *prim)
+int llc_build_and_send_pkt(struct sock *sk, struct sk_buff *skb)
 {
 	struct llc_conn_state_ev *ev;
 	int rc = -ECONNABORTED;
-	/* accept data frame from network layer to be sent using connection
-	 * mode communication; timeout/retries handled by this layer;
-	 * package primitive as an event and send to connection event handler
-	 */
-	struct sock *sk = prim->data->data.sk;
 	struct llc_opt *llc = llc_sk(sk);
 
 	lock_sock(sk);
@@ -267,13 +261,13 @@ static int llc_data_req_handler(struct llc_prim_if_block *prim)
 		llc->failed_data_req = 1;
 		goto out;
 	}
-	ev = llc_conn_ev(prim->data->data.skb);
-	ev->type		  = LLC_CONN_EV_TYPE_PRIM;
-	ev->data.prim.prim	  = LLC_DATA_PRIM;
-	ev->data.prim.type	  = LLC_PRIM_TYPE_REQ;
-	ev->data.prim.data	  = prim;
-	prim->data->data.skb->dev = llc->dev;
-	rc = llc_conn_state_process(sk, prim->data->data.skb);
+	ev = llc_conn_ev(skb);
+	ev->type	    = LLC_CONN_EV_TYPE_PRIM;
+	ev->data.prim.prim  = LLC_DATA_PRIM;
+	ev->data.prim.type  = LLC_PRIM_TYPE_REQ;
+	ev->data.prim.data  = NULL;
+	skb->dev	    = llc->dev;
+	rc = llc_conn_state_process(sk, skb);
 out:
 	release_sock(sk);
 	return rc;

net/llc/llc_sock.c

@@ -215,22 +215,14 @@ static int llc_ui_send_disc(struct sock *sk)
 static int llc_ui_send_data(struct llc_sap *sap, struct sock* sk,
 			    struct sk_buff *skb, struct sockaddr_llc *addr)
 {
-	union llc_u_prim_data prim_data;
-	struct llc_prim_if_block prim;
 	struct llc_ui_opt* llc_ui = llc_ui_sk(sk);
 	struct llc_opt* llc_core = llc_sk(llc_ui->core_sk);
 	int rc;
 
-	prim.data	   = &prim_data;
-	prim.sap	   = sap;
-	prim.prim	   = LLC_DATA_PRIM;
-	prim_data.data.skb = skb;
-	prim_data.data.pri = 0;
-	prim_data.data.sk  = llc_ui->core_sk;
-	skb->protocol	   = llc_ui_protocol_type(addr->sllc_arphrd);
+	skb->protocol = llc_ui_protocol_type(addr->sllc_arphrd);
 	sock_hold(sk);
 try:
-	rc = sap->req(&prim);
+	rc = llc_build_and_send_pkt(llc_ui->core_sk, skb);
 	if (rc != -EBUSY)
 		goto out;
 	rc = wait_event_interruptible(sk->socket->wait, !llc_ui->core_sk ||