lkml.org 
[lkml]   [2018]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL for 4.9 286/293] net: Extra '_get' in declaration of arch_get_platform_mac_address
    Date
    From: Mathieu Malaterre <malat@debian.org>

    [ Upstream commit e728789c52afccc1275cba1dd812f03abe16ea3c ]

    In commit c7f5d105495a ("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 <malat@debian.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    ---
    include/linux/etherdevice.h | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
    index 6fec9e81bd70..a3a47b1bda91 100644
    --- a/include/linux/etherdevice.h
    +++ b/include/linux/etherdevice.h
    @@ -31,7 +31,7 @@
    #ifdef __KERNEL__
    struct device;
    int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
    -unsigned char *arch_get_platform_get_mac_address(void);
    +unsigned char *arch_get_platform_mac_address(void);
    u32 eth_get_headlen(void *data, unsigned int max_len);
    __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
    extern const struct header_ops eth_header_ops;
    --
    2.15.1
    \
     
     \ /
      Last update: 2018-04-09 03:43    [W:4.087 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site