[LLC] Make llc_save_primitive ready for dataunit/xid/test DGRAM packets

net/llc/llc_conn.c

@@ -39,22 +39,20 @@ static struct llc_conn_state_trans *llc_qualify_conn_ev(struct sock *sk,
 /* Offset table on connection states transition diagram */
 static int llc_offset_table[NBR_CONN_STATES][NBR_CONN_EV];
 
-static void llc_save_primitive(struct sock *sk, struct sk_buff* skb,
-			       u8 ua, u8 test, u8 xid)
+void llc_save_primitive(struct sock *sk, struct sk_buff* skb, u8 prim)
 {
-	struct llc_opt *llc = llc_sk(sk);
 	struct sockaddr_llc *addr = llc_ui_skb_cb(skb);
 
        /* save primitive for use by the user. */
 	addr->sllc_family = sk->family;
 	addr->sllc_arphrd = skb->dev->type;
-	addr->sllc_test   = test;
-	addr->sllc_xid    = xid;
-	addr->sllc_ua     = ua;
-	addr->sllc_dsap   = llc->sap->laddr.lsap;
-	memcpy(addr->sllc_dmac, llc->laddr.mac, IFHWADDRLEN);
-	addr->sllc_ssap	  = llc->daddr.lsap;
-	memcpy(addr->sllc_smac, llc->daddr.mac, IFHWADDRLEN);
+	addr->sllc_test   = prim == LLC_TEST_PRIM;
+	addr->sllc_xid    = prim == LLC_XID_PRIM;
+	addr->sllc_ua     = prim == LLC_DATAUNIT_PRIM;
+	llc_pdu_decode_sa(skb, addr->sllc_smac);
+	llc_pdu_decode_da(skb, addr->sllc_dmac);
+	llc_pdu_decode_dsap(skb, &addr->sllc_dsap);
+	llc_pdu_decode_ssap(skb, &addr->sllc_ssap);
 }
 
 /**
@@ -96,7 +94,7 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
 		 */
 		switch (flag) {
 		case LLC_DATA_PRIM + 1:
-			llc_save_primitive(sk, skb, 0, 0, 0);
+			llc_save_primitive(sk, skb, LLC_DATA_PRIM);
 			if (sock_queue_rcv_skb(sk, skb)) {
 				/*
 				 * FIXME: have to sync the LLC state