1 files changed, 45 insertions, 10 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 3de49aca4519..b4cfb63f264e 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1143,8 +1143,18 @@ struct net_device {
         struct list_head        dev_list;
         struct list_head        napi_list;
         struct list_head        unreg_list;
-        struct list_head        upper_dev_list; /* List of upper devices */
-        struct list_head        lower_dev_list;
+
+        /* directly linked devices, like slaves for bonding */
+        struct {
+                struct list_head upper;
+                struct list_head lower;
+        } adj_list;
+
+        /* all linked devices, *including* neighbours */
+        struct {
+                struct list_head upper;
+                struct list_head lower;
+        } all_adj_list;
 
 
         /* currently active device features */
@@ -2813,24 +2823,49 @@ extern int		bpf_jit_enable;
 extern bool netdev_has_upper_dev(struct net_device *dev,
                                  struct net_device *upper_dev);
 extern bool netdev_has_any_upper_dev(struct net_device *dev);
-extern struct net_device *netdev_upper_get_next_dev_rcu(struct net_device *dev,
-                                                        struct list_head **iter);
+extern struct net_device *netdev_all_upper_get_next_dev_rcu(struct net_device *dev,
+                                                            struct list_head **iter);
 
 /* iterate through upper list, must be called under RCU read lock */
-#define netdev_for_each_upper_dev_rcu(dev, upper, iter) \
-        for (iter = &(dev)->upper_dev_list, \
-             upper = netdev_upper_get_next_dev_rcu(dev, &(iter)); \
-             upper; \
-             upper = netdev_upper_get_next_dev_rcu(dev, &(iter)))
-
+#define netdev_for_each_all_upper_dev_rcu(dev, updev, iter) \
+        for (iter = &(dev)->all_adj_list.upper, \
+             updev = netdev_all_upper_get_next_dev_rcu(dev, &(iter)); \
+             updev; \
+             updev = netdev_all_upper_get_next_dev_rcu(dev, &(iter)))
+
+extern void *netdev_lower_get_next_private(struct net_device *dev,
+                                           struct list_head **iter);
+extern void *netdev_lower_get_next_private_rcu(struct net_device *dev,
+                                               struct list_head **iter);
+
+#define netdev_for_each_lower_private(dev, priv, iter) \
+        for (iter = (dev)->adj_list.lower.next, \
+             priv = netdev_lower_get_next_private(dev, &(iter)); \
+             priv; \
+             priv = netdev_lower_get_next_private(dev, &(iter)))
+
+#define netdev_for_each_lower_private_rcu(dev, priv, iter) \
+        for (iter = &(dev)->adj_list.lower, \
+             priv = netdev_lower_get_next_private_rcu(dev, &(iter)); \
+             priv; \
+             priv = netdev_lower_get_next_private_rcu(dev, &(iter)))
+
+extern void *netdev_adjacent_get_private(struct list_head *adj_list);
 extern struct net_device *netdev_master_upper_dev_get(struct net_device *dev);
 extern struct net_device *netdev_master_upper_dev_get_rcu(struct net_device *dev);
 extern int netdev_upper_dev_link(struct net_device *dev,
                                  struct net_device *upper_dev);
 extern int netdev_master_upper_dev_link(struct net_device *dev,
                                         struct net_device *upper_dev);
+extern int netdev_master_upper_dev_link_private(struct net_device *dev,
+                                                struct net_device *upper_dev,
+                                                void *private);
 extern void netdev_upper_dev_unlink(struct net_device *dev,
                                     struct net_device *upper_dev);
+extern void *netdev_lower_dev_get_private_rcu(struct net_device *dev,
+                                              struct net_device *lower_dev);
+extern void *netdev_lower_dev_get_private(struct net_device *dev,
+                                          struct net_device *lower_dev);
 extern int skb_checksum_help(struct sk_buff *skb);
 extern struct sk_buff *__skb_gso_segment(struct sk_buff *skb,
         netdev_features_t features, bool tx_path);