diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-22 03:55:22 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-22 03:57:26 +0100 |
| commit | 9be68c1ae07f351c1fcf4dc2890c391435c7e3d7 (patch) | |
| tree | 307320b788f6c6ced9f8ebcfa6c7ba70941e23bf | |
| parent | Merge branch 'sctp' (diff) | |
| download | linux-9be68c1ae07f351c1fcf4dc2890c391435c7e3d7.tar.xz linux-9be68c1ae07f351c1fcf4dc2890c391435c7e3d7.zip | |
net: Fix some fallout from the etner_addr_copy() changes.
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>
| -rw-r--r-- | net/appletalk/aarp.c | 1 | ||||
| -rw-r--r-- | net/atm/lec.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c index d0b7be15dbb9..d27b86dfb0e9 100644 --- a/net/appletalk/aarp.c +++ b/net/appletalk/aarp.c @@ -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; diff --git a/net/atm/lec.c b/net/atm/lec.c index 0b73ae9a1040..5a2f602d07e1 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -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) |