summaryrefslogtreecommitdiff
path: root/net/core/dev.h
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-13 06:40:34 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-01-13 06:40:34 +0100
commitdd19f4116ec330bc985e1a85a66b8dd0f2dca20d (patch)
treeaaa5b5c3b7105ab2ed22b1c5107ba9127fbeafa9 /net/core/dev.h
parent8ff656643d3075154419680470dbfdbd6092e31f (diff)
parent5bc55a333a2f7316b58edc7573e8e893f7acb532 (diff)
Merge 6.13-rc7 into driver-core-next
We need the debugfs / driver-core fixes in here as well for testing and to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/core/dev.h')
-rw-r--r--net/core/dev.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.h b/net/core/dev.h
index d043dee25a68..deb5eae5749f 100644
--- a/net/core/dev.h
+++ b/net/core/dev.h
@@ -22,6 +22,8 @@ struct sd_flow_limit {
extern int netdev_flow_limit_table_len;
+struct napi_struct *netdev_napi_by_id(struct net *net, unsigned int napi_id);
+
#ifdef CONFIG_PROC_FS
int __init dev_proc_init(void);
#else
@@ -269,7 +271,6 @@ void xdp_do_check_flushed(struct napi_struct *napi);
static inline void xdp_do_check_flushed(struct napi_struct *napi) { }
#endif
-struct napi_struct *napi_by_id(unsigned int napi_id);
void kick_defer_list_purge(struct softnet_data *sd, unsigned int cpu);
#define XMIT_RECURSION_LIMIT 8