summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@pefoley.com>2023-01-13 07:49:08 +0300
committerRichard Weinberger <richard@nod.at>2023-02-13 12:13:48 +0300
commit2c4d3841a82b88ae8a7b518dc6206f84f68e705a (patch)
tree0eba13720d5c37a2c93058e6da4843ed67590190 /arch/um
parent2f2be5102480b1058182fa6c4b1e5c1732d6760c (diff)
downloadlinux-2c4d3841a82b88ae8a7b518dc6206f84f68e705a.tar.xz
um: Avoid pcap multiple definition errors
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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/drivers/pcap_kern.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index cfe4cb17694c..25ee2c97ca21 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -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,