Skip to content

Commit 12b8e7e

Browse files
kot-begemot-ukjmberg-intel
authored andcommitted
um: Remove obsolete pcap driver
Remove the pcap driver in UML. It is obsolete. It does not build on recent systems due to changes in libpcap and its dependencies. The vector driver's raw transport in UML provides identical functionality. Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> Link: https://patch.msgid.link/20240328132424.376456-1-anton.ivanov@cambridgegreys.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent b2f9b77 commit 12b8e7e

5 files changed

Lines changed: 2 additions & 299 deletions

File tree

arch/um/drivers/Kconfig

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -297,26 +297,6 @@ config UML_NET_MCAST
297297

298298
If unsure, say N.
299299

300-
config UML_NET_PCAP
301-
bool "pcap transport (obsolete)"
302-
depends on UML_NET
303-
depends on !MODVERSIONS
304-
select MAY_HAVE_RUNTIME_DEPS
305-
help
306-
The pcap transport makes a pcap packet stream on the host look
307-
like an ethernet device inside UML. This is useful for making
308-
UML act as a network monitor for the host. You must have libcap
309-
installed in order to build the pcap transport into UML.
310-
311-
For more information, see
312-
<http://user-mode-linux.sourceforge.net/old/networking.html> That site
313-
has examples of the UML command line to use to enable this option.
314-
315-
NOTE: THIS TRANSPORT IS DEPRECATED AND WILL BE REMOVED SOON!!! Please
316-
migrate to UML_NET_VECTOR.
317-
318-
If unsure, say N.
319-
320300
config UML_NET_SLIRP
321301
bool "SLiRP transport (obsolete)"
322302
depends on UML_NET

arch/um/drivers/Makefile

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,9 @@ harddog-objs := harddog_kern.o
2020
harddog-builtin-$(CONFIG_UML_WATCHDOG) := harddog_user.o harddog_user_exp.o
2121
rtc-objs := rtc_kern.o rtc_user.o
2222

23-
LDFLAGS_pcap.o = $(shell $(CC) $(KBUILD_CFLAGS) -print-file-name=libpcap.a)
24-
2523
LDFLAGS_vde.o = $(shell $(CC) $(CFLAGS) -print-file-name=libvdeplug.a)
2624

27-
targets := pcap_kern.o pcap_user.o vde_kern.o vde_user.o
28-
29-
$(obj)/pcap.o: $(obj)/pcap_kern.o $(obj)/pcap_user.o
30-
$(LD) -r -dp -o $@ $^ $(ld_flags)
25+
targets := vde_kern.o vde_user.o
3126

3227
$(obj)/vde.o: $(obj)/vde_kern.o $(obj)/vde_user.o
3328
$(LD) -r -dp -o $@ $^ $(ld_flags)
@@ -49,7 +44,6 @@ obj-$(CONFIG_UML_NET_DAEMON) += daemon.o
4944
obj-$(CONFIG_UML_NET_VECTOR) += vector.o
5045
obj-$(CONFIG_UML_NET_VDE) += vde.o
5146
obj-$(CONFIG_UML_NET_MCAST) += umcast.o
52-
obj-$(CONFIG_UML_NET_PCAP) += pcap.o
5347
obj-$(CONFIG_UML_NET) += net.o
5448
obj-$(CONFIG_MCONSOLE) += mconsole.o
5549
obj-$(CONFIG_MMAPPER) += mmapper_kern.o
@@ -69,7 +63,7 @@ obj-$(CONFIG_UML_RTC) += rtc.o
6963
obj-$(CONFIG_UML_PCI_OVER_VIRTIO) += virt-pci.o
7064

7165
# pcap_user.o must be added explicitly.
72-
USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o vector_user.o
66+
USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o vde_user.o vector_user.o
7367
CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
7468

7569
CFLAGS_xterm.o += '-DCONFIG_XTERM_CHAN_DEFAULT_EMULATOR="$(CONFIG_XTERM_CHAN_DEFAULT_EMULATOR)"'

arch/um/drivers/pcap_kern.c

Lines changed: 0 additions & 113 deletions
This file was deleted.

arch/um/drivers/pcap_user.c

Lines changed: 0 additions & 137 deletions
This file was deleted.

arch/um/drivers/pcap_user.h

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)