Commit 648880e9 authored by Martin KaFai Lau's avatar Martin KaFai Lau
Browse files

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: default avatarMartin KaFai Lau <martin.lau@kernel.org>
parents 87dc2bb3 680ee045

drivers/net/bonding/bond_main.c

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ 
#include <net/tls.h>

#endif

#include <net/ip6_route.h>

#include <net/xdp.h>



#include "bonding_priv.h"

drivers/net/ethernet/amazon/ena/ena_netdev.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/interrupt.h>

#include <linux/netdevice.h>

#include <linux/skbuff.h>

#include <net/xdp.h>

#include <uapi/linux/bpf.h>



#include "ena_com.h"

drivers/net/ethernet/engleder/tsnep.h

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/net_tstamp.h>

#include <linux/ptp_clock_kernel.h>

#include <linux/miscdevice.h>

#include <net/xdp.h>



#define TSNEP "tsnep"

drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/fsl/mc.h>

#include <linux/net_tstamp.h>

#include <net/devlink.h>

#include <net/xdp.h>



#include <soc/fsl/dpaa2-io.h>

#include <soc/fsl/dpaa2-fd.h>

drivers/net/ethernet/freescale/enetc/enetc.h

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/if_vlan.h>

#include <linux/phylink.h>

#include <linux/dim.h>

#include <net/xdp.h>



#include "enetc_hw.h"