Merge tag 'clk-for-linus-3.12' of git://git.linaro.org/people/mturquette/linux

[karo-tx-linux.git] / net / llc / af_llc.c

diff --git a/net/llc/af_llc.c b/net/llc/af_llc.c
index 48aaa89253e037c9b7f2e07f3bc1d03d837266fd..6cba486353e8a33dcba394e89664f3886da205c2 100644 (file)
--- a/net/llc/af_llc.c
+++ b/net/llc/af_llc.c
@@ -321,12 +321,12 @@ static int llc_ui_bind(struct socket *sock, struct sockaddr *uaddr, int addrlen)
                if (llc->dev) {
                        if (!addr->sllc_arphrd)
                                addr->sllc_arphrd = llc->dev->type;
-                       if (llc_mac_null(addr->sllc_mac))
+                       if (is_zero_ether_addr(addr->sllc_mac))
                                memcpy(addr->sllc_mac, llc->dev->dev_addr,
                                       IFHWADDRLEN);
                        if (addr->sllc_arphrd != llc->dev->type ||
-                           !llc_mac_match(addr->sllc_mac,
-                                          llc->dev->dev_addr)) {
+                           !ether_addr_equal(addr->sllc_mac,
+                                             llc->dev->dev_addr)) {
                                rc = -EINVAL;
                                llc->dev = NULL;
                        }