Skip to content

Commit 327aac8

Browse files
malaterregregkh
authored andcommitted
net: Extra '_get' in declaration of arch_get_platform_mac_address
[ Upstream commit e728789 ] In commit c7f5d10 ("net: Add eth_platform_get_mac_address() helper."), two declarations were added: int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr); unsigned char *arch_get_platform_get_mac_address(void); An extra '_get' was introduced in arch_get_platform_get_mac_address, remove it. Fix compile warning using W=1: CC net/ethernet/eth.o net/ethernet/eth.c:523:24: warning: no previous prototype for ‘arch_get_platform_mac_address’ [-Wmissing-prototypes] unsigned char * __weak arch_get_platform_mac_address(void) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ AR net/ethernet/built-in.o Signed-off-by: Mathieu Malaterre <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0b1fa24 commit 327aac8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

include/linux/etherdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#ifdef __KERNEL__
3232
struct device;
3333
int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
34-
unsigned char *arch_get_platform_get_mac_address(void);
34+
unsigned char *arch_get_platform_mac_address(void);
3535
u32 eth_get_headlen(void *data, unsigned int max_len);
3636
__be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
3737
extern const struct header_ops eth_header_ops;

0 commit comments

Comments
 (0)