Merge master.kernel.org:/home/acme/BK/newdatalink-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

net/llc/llc_if.c

@@ -330,7 +330,7 @@ static int llc_conn_req_handler(struct llc_prim_if_block *prim)
 
 	memcpy(laddr.mac, sdev->dev_addr, sizeof(laddr.mac));
 	laddr.lsap = prim->data->conn.saddr.lsap;
-	memcpy(daddr.mac, ddev->dev_addr, sizeof(daddr.mac));
+	memcpy(daddr.mac, prim->data->conn.daddr.mac, sizeof(daddr.mac));
 	daddr.lsap = prim->data->conn.daddr.lsap;
 	sk = llc_find_sock(sap, &daddr, &laddr);
 	if (sk) {

net/llc/llc_sock.c

@@ -1539,8 +1539,8 @@ static void llc_ui_conf_conn(struct llc_prim_if_block *prim)
 {
 	struct llc_prim_conn *prim_data = &prim->data->conn;
 	struct llc_opt *llc_core = llc_sk(prim_data->sk);
-	struct llc_ui_opt *llc_ui = llc_ui_sk(prim_data->sk);
 	struct sock* sk = llc_core->handler;
+	struct llc_ui_opt *llc_ui = llc_ui_sk(sk);
 
 	if (!sk)
 		goto out;