[PATCH] net: Fix some fallout from the etner_addr_copy() changes.

[PATCH] net: Fix some fallout from the etner_addr_copy() changes.

[David Miller]

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 | 1 +
 net/atm/lec.c        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/appletalk/aarp.c b/net/appletalk/aarp.c
index d0b7be1..d27b86d 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 0b73ae9..5a2f602 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)
-- 
1.7.11.7

Re: [PATCH] net: Fix some fallout from the etner_addr_copy() changes.

[François-Xavier Le Bail]

On Tue, 1/21/14, David Miller <davem@davemloft.net> wrote:

> Subject: [PATCH] net: Fix some fallout from the etner_addr_copy() changes.
 
s/etner_addr_copy/ether_addr_copy.

Cheers,
Francois-Xavier

Re: [PATCH] net: Fix some fallout from the etner_addr_copy() changes.

[Bill Fink]

On Tue, 21 Jan 2014, David Miller wrote:

> 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 | 1 +
>  net/atm/lec.c        | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)

The commit message indicates problems with appletalk/aarp.c,
atm/lec.c, and caif/caif_usb.c, but the diffstat and patch only
address the first two and not caif/caif_usb.c.  Is that intended
or am I missing something.

					-Bill

Re: [PATCH] net: Fix some fallout from the etner_addr_copy() changes.

[David Miller]

From: Bill Fink <billfink@mindspring.com>
Date: Tue, 21 Jan 2014 23:23:31 -0500

> The commit message indicates problems with appletalk/aarp.c,
> atm/lec.c, and caif/caif_usb.c, but the diffstat and patch only
> address the first two and not caif/caif_usb.c.  Is that intended
> or am I missing something.

Thanks for catching that, I just pushed the missing change.

Re: [PATCH] net: Fix some fallout from the etner_addr_copy() changes.

[Joe Perches]

On Tue, 2014-01-21 at 22:54 -0800, David Miller wrote:
> From: Bill Fink <billfink@mindspring.com>
> Date: Tue, 21 Jan 2014 23:23:31 -0500
> 
> > The commit message indicates problems with appletalk/aarp.c,
> > atm/lec.c, and caif/caif_usb.c, but the diffstat and patch only
> > address the first two and not caif/caif_usb.c.  Is that intended
> > or am I missing something.
> 
> Thanks for catching that, I just pushed the missing change.

My apologies for my stupid carelessness in the
patches I sent here.

I thought #define ETH_ALEN was in the same #include
as ether_addr_copy and I didn't bother compiling.