diff options
| author | Martin KaFai Lau <martin.lau@kernel.org> | 2023-08-03 18:38:07 +0300 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2023-08-03 18:38:53 +0300 |
| commit | 648880e9331c68b2008430fd90f3648d1795399d (patch) | |
| tree | 738e89e1fdb86967ee4f9d3f266bacde2d9fc170 /net/core | |
| parent | 87dc2bb3291832994d216c7c86e3f4898022272f (diff) | |
| parent | 680ee0456a5712309db9ec2692e908ea1d6b1644 (diff) | |
| download | linux-648880e9331c68b2008430fd90f3648d1795399d.tar.xz | |
Merge branch 'net: struct netdev_rx_queue and xdp.h reshuffling'
Jakub Kicinski says:
====================
While poking at struct netdev_rx_queue I got annoyed by
the huge rebuild times. I split it out from netdevice.h
and then realized that it was the main reason we included
xdp.h in there. So I removed that dependency as well.
This gives us very pleasant build times for both xdp.h
and struct netdev_rx_queue changes.
I'm sending this for bpf-next because I think it'd be easiest
if it goes in there, and then bpf-next gets flushed soon after?
I can also make a branch on merge-base for net-next and bpf-next..
v2:
- build fix
- reorder some includes
v1: https://lore.kernel.org/all/20230802003246.2153774-1-kuba@kernel.org/
====================
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/dev.c | 1 | ||||
| -rw-r--r-- | net/core/net-sysfs.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 002fec07de73..1916ec990f58 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -152,6 +152,7 @@ #include <linux/pm_runtime.h> #include <linux/prandom.h> #include <linux/once_lite.h> +#include <net/netdev_rx_queue.h> #include "dev.h" #include "net-sysfs.h" diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 15e3f4606b5f..fccaa5bac0ed 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -23,6 +23,7 @@ #include <linux/of.h> #include <linux/of_net.h> #include <linux/cpu.h> +#include <net/netdev_rx_queue.h> #include "dev.h" #include "net-sysfs.h" |