um: Avoid pcap multiple definition errors
authorPeter Foley <pefoley2@pefoley.com>
Fri, 13 Jan 2023 04:49:08 +0000 (23:49 -0500)
committerRichard Weinberger <richard@nod.at>
Mon, 13 Feb 2023 09:13:48 +0000 (10:13 +0100)
Change the function name in pcap_kern to avoid conflicting with
libpcap.a.

e.g.
ld: /usr/lib/gcc/x86_64-pc-linux-gnu/12/../../../../lib64/libpcap.a(pcap.o): in function `pcap_init':
(.text+0x7f0): multiple definition of `pcap_init'; arch/um/drivers/pcap_kern.o:pcap_kern.c:(.text.unlikely+0x0): first defined here

Signed-off-by: Peter Foley <pefoley2@pefoley.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
arch/um/drivers/pcap_kern.c

index cfe4cb17694cc611fdb738b255421951945ad53f..25ee2c97ca21e49e500fc07da009611f256d5c5c 100644 (file)
@@ -15,7 +15,7 @@ struct pcap_init {
        char *filter;
 };
 
-void pcap_init(struct net_device *dev, void *data)
+void pcap_init_kern(struct net_device *dev, void *data)
 {
        struct uml_net_private *pri;
        struct pcap_data *ppri;
@@ -44,7 +44,7 @@ static int pcap_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
 }
 
 static const struct net_kern_info pcap_kern_info = {
-       .init                   = pcap_init,
+       .init                   = pcap_init_kern,
        .protocol               = eth_protocol,
        .read                   = pcap_read,
        .write                  = pcap_write,