net: Fix some fallout from the etner_addr_copy() changes.
authorDavid S. Miller <davem@davemloft.net>
Wed, 22 Jan 2014 02:55:22 +0000 (18:55 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 22 Jan 2014 02:57:26 +0000 (18:57 -0800)
net/appletalk/aarp.c: In function ‘__aarp_send_query’:
net/appletalk/aarp.c:137:2: error: implicit declaration of function ‘ether_addr_copy’ [-Werror=implicit-function-declaration]
 ...
net/atm/lec.c: In function ‘send_to_lecd’:
net/atm/lec.c:524:3: warning: passing argument 1 of ‘ether_addr_copy’ from incompatible pointer type [enabled by default]
In file included from net/atm/lec.c:17:0:
include/linux/etherdevice.h:227:20: note: expected ‘u8 *’ but argument is of type ‘unsigned char (*)[6]’
 ...
net/caif/caif_usb.c: In function ‘cfusbl_create’:
net/caif/caif_usb.c:108:2: error: implicit declaration of function ‘ether_addr_copy’ [-Werror=implicit-function-declaration]

Signed-off-by: David S. Miller <davem@davemloft.net>
net/appletalk/aarp.c
net/atm/lec.c

index d0b7be1..d27b86d 100644 (file)
@@ -40,6 +40,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/export.h>
+#include <linux/etherdevice.h>
 
 int sysctl_aarp_expiry_time = AARP_EXPIRY_TIME;
 int sysctl_aarp_tick_time = AARP_TICK_TIME;
index 0b73ae9..5a2f602 100644 (file)
@@ -521,7 +521,7 @@ send_to_lecd(struct lec_priv *priv, atmlec_msg_type type,
        if (data != NULL)
                mesg->sizeoftlvs = data->len;
        if (mac_addr)
-               ether_addr_copy(&mesg->content.normal.mac_addr, mac_addr);
+               ether_addr_copy(mesg->content.normal.mac_addr, mac_addr);
        else
                mesg->content.normal.targetless_le_arp = 1;
        if (atm_addr)