2 files changed, 1 insertions, 5 deletions

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index febae702685c..9208cf5f2bd5 100644
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -935,7 +935,7 @@ static int llc_ui_getname(struct socket *sock, struct sockaddr *uaddr,
 
                 if (llc->dev) {
                         sllc.sllc_arphrd = llc->dev->type;
-                        memcpy(&sllc.sllc_mac, &llc->dev->dev_addr,
+                        memcpy(&sllc.sllc_mac, llc->dev->dev_addr,
                                IFHWADDRLEN);
                 }
         }
diff --git a/net/llc/llc_conn.c b/net/llc/llc_conn.c
index 3477624a4906..c6bab39b018e 100644
--- a/net/llc/llc_conn.c
+++ b/net/llc/llc_conn.c
@@ -79,10 +79,6 @@ int llc_conn_state_process(struct sock *sk, struct sk_buff *skb)
 
         if (unlikely(!ev->ind_prim && !ev->cfm_prim)) {
                 /* indicate or confirm not required */
-                /* XXX this is not very pretty, perhaps we should store
-                 * XXX indicate/confirm-needed state in the llc_conn_state_ev
-                 * XXX control block of the SKB instead? -DaveM
-                 */
                 if (!skb->next)
                         goto out_kfree_skb;
                 goto out_skb_put;