Merge git://git.infradead.org/battery-2.6

[mv-sheeva.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index febae702685cf58726918601bc613caba15f3af6..9208cf5f2bd554fb4d66fba51c327bcc3d7a5aae 100644 (file)
--- 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);
                }
        }