Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux-2.6-microblaze.git] / net / core / dev.h

diff --git a/net/core/dev.h b/net/core/dev.h
index 7480b4c..2bcaf8e 100644 (file)
--- a/net/core/dev.h
+++ b/net/core/dev.h
@@ -3,6 +3,7 @@
 #define _NET_CORE_DEV_H
 
 #include <linux/types.h>
+#include <linux/rwsem.h>
 
 struct net;
 struct net_device;
@@ -37,15 +38,14 @@ int dev_addr_init(struct net_device *dev);
 void dev_addr_check(struct net_device *dev);
 
 /* sysctls not referred to from outside net/core/ */
-extern int             netdev_budget;
-extern unsigned int    netdev_budget_usecs;
 extern unsigned int    sysctl_skb_defer_max;
-extern int             netdev_tstamp_prequeue;
 extern int             netdev_unregister_timeout_secs;
 extern int             weight_p;
 extern int             dev_weight_rx_bias;
 extern int             dev_weight_tx_bias;
 
+extern struct rw_semaphore dev_addr_sem;
+
 /* rtnl helpers */
 extern struct list_head net_todo_list;
 void netdev_run_todo(void);
@@ -56,6 +56,7 @@ struct netdev_name_node {
        struct list_head list;
        struct net_device *dev;
        const char *name;
+       struct rcu_head rcu;
 };
 
 int netdev_get_name(struct net *net, char *name, int ifindex);