Skip to content

Commit a92bb54

Browse files
Jakub Kicinskidavem330
authored andcommitted
tools: rename tools/net directory to tools/bpf
We currently only have BPF tools in the tools/net directory. We are about to add more BPF tools there, not necessarily networking related, rename the directory and related Makefile targets to bpf. Suggested-by: Daniel Borkmann <[email protected]> Signed-off-by: Jakub Kicinski <[email protected]> Reviewed-by: Simon Horman <[email protected]> Acked-by: Daniel Borkmann <[email protected]> Acked-by: Alexei Starovoitov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent c331501 commit a92bb54

File tree

8 files changed

+8
-9
lines changed

8 files changed

+8
-9
lines changed

MAINTAINERS

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2725,7 +2725,7 @@ F: net/core/filter.c
27252725
F: net/sched/act_bpf.c
27262726
F: net/sched/cls_bpf.c
27272727
F: samples/bpf/
2728-
F: tools/net/bpf*
2728+
F: tools/bpf/
27292729
F: tools/testing/selftests/bpf/
27302730

27312731
BROADCOM B44 10/100 ETHERNET DRIVER
@@ -9416,7 +9416,6 @@ F: include/uapi/linux/in.h
94169416
F: include/uapi/linux/net.h
94179417
F: include/uapi/linux/netdevice.h
94189418
F: include/uapi/linux/net_namespace.h
9419-
F: tools/net/
94209419
F: tools/testing/selftests/net/
94219420
F: lib/random32.c
94229421

tools/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ help:
1919
@echo ' kvm_stat - top-like utility for displaying kvm statistics'
2020
@echo ' leds - LEDs tools'
2121
@echo ' liblockdep - user-space wrapper for kernel locking-validator'
22-
@echo ' net - misc networking tools'
22+
@echo ' bpf - misc BPF tools'
2323
@echo ' perf - Linux performance measurement and analysis tool'
2424
@echo ' selftests - various kernel selftests'
2525
@echo ' spi - spi tools'
@@ -57,7 +57,7 @@ acpi: FORCE
5757
cpupower: FORCE
5858
$(call descend,power/$@)
5959

60-
cgroup firewire hv guest spi usb virtio vm net iio gpio objtool leds: FORCE
60+
cgroup firewire hv guest spi usb virtio vm bpf iio gpio objtool leds: FORCE
6161
$(call descend,$@)
6262

6363
liblockdep: FORCE
@@ -91,7 +91,7 @@ kvm_stat: FORCE
9191

9292
all: acpi cgroup cpupower gpio hv firewire liblockdep \
9393
perf selftests spi turbostat usb \
94-
virtio vm net x86_energy_perf_policy \
94+
virtio vm bpf x86_energy_perf_policy \
9595
tmon freefall iio objtool kvm_stat
9696

9797
acpi_install:
@@ -100,7 +100,7 @@ acpi_install:
100100
cpupower_install:
101101
$(call descend,power/$(@:_install=),install)
102102

103-
cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install:
103+
cgroup_install firewire_install gpio_install hv_install iio_install perf_install spi_install usb_install virtio_install vm_install bpf_install objtool_install:
104104
$(call descend,$(@:_install=),install)
105105

106106
liblockdep_install:
@@ -124,7 +124,7 @@ kvm_stat_install:
124124
install: acpi_install cgroup_install cpupower_install gpio_install \
125125
hv_install firewire_install iio_install liblockdep_install \
126126
perf_install selftests_install turbostat_install usb_install \
127-
virtio_install vm_install net_install x86_energy_perf_policy_install \
127+
virtio_install vm_install bpf_install x86_energy_perf_policy_install \
128128
tmon_install freefall_install objtool_install kvm_stat_install
129129

130130
acpi_clean:
@@ -133,7 +133,7 @@ acpi_clean:
133133
cpupower_clean:
134134
$(call descend,power/cpupower,clean)
135135

136-
cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean net_clean iio_clean gpio_clean objtool_clean leds_clean:
136+
cgroup_clean hv_clean firewire_clean spi_clean usb_clean virtio_clean vm_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean:
137137
$(call descend,$(@:_clean=),clean)
138138

139139
liblockdep_clean:
@@ -169,7 +169,7 @@ build_clean:
169169

170170
clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean \
171171
perf_clean selftests_clean turbostat_clean spi_clean usb_clean virtio_clean \
172-
vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
172+
vm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
173173
freefall_clean build_clean libbpf_clean libsubcmd_clean liblockdep_clean \
174174
gpio_clean objtool_clean leds_clean
175175

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)