Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cd5773a authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

net: core: move mac_pton() to lib/net_utils.c 



Since we have at least one user of this function outside of CONFIG_NET
scope, we have to provide this function independently. The proposed
solution is to move it under lib/net_utils.c with corresponding
configuration variable and select wherever it is needed.

Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reported-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 143e9c76

drivers/misc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -480,6 +480,7 @@ config BMP085_SPI 


config PCH_PHUB

	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"

	select GENERIC_NET_UTILS

	depends on PCI

	help

	  This driver is for PCH(Platform controller Hub) PHUB(Packet Hub) of

drivers/net/netconsole.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/slab.h>

#include <linux/console.h>

#include <linux/moduleparam.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/netpoll.h>

#include <linux/inet.h>

include/linux/if_ether.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ static inline struct ethhdr *eth_hdr(const struct sk_buff *skb) 


int eth_header_parse(const struct sk_buff *skb, unsigned char *haddr);



int mac_pton(const char *s, u8 *mac);

extern ssize_t sysfs_format_mac(char *buf, const unsigned char *addr, int len);



#endif	/* _LINUX_IF_ETHER_H */

include/linux/kernel.h

+2 −0
Original line number Diff line number Diff line
@@ -450,6 +450,8 @@ static inline char * __deprecated pack_hex_byte(char *buf, u8 byte) 
extern int hex_to_bin(char ch);

extern int __must_check hex2bin(u8 *dst, const char *src, size_t count);



int mac_pton(const char *s, u8 *mac);



/*

 * General tracing related utility functions - trace_printk(),

 * tracing_on/tracing_off and tracing_start()/tracing_stop

lib/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ config GENERIC_STRNCPY_FROM_USER 
config GENERIC_STRNLEN_USER

	bool



config GENERIC_NET_UTILS

	bool



config GENERIC_FIND_FIRST_BIT

	bool