1 files changed, 15 insertions, 1 deletions

diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b683971e500d..b1ff77276bc4 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -575,6 +575,9 @@ struct netdev_queue {
          * (/sys/class/net/DEV/Q/trans_timeout)
          */
         unsigned long           trans_timeout;
+
+        /* Subordinate device that the queue has been assigned to */
+        struct net_device       *sb_dev;
 /*
  * write-mostly part
  */
@@ -1991,7 +1994,7 @@ struct net_device {
 #ifdef CONFIG_DCB
         const struct dcbnl_rtnl_ops *dcbnl_ops;
 #endif
-        u8                      num_tc;
+        s16                     num_tc;
         struct netdev_tc_txq    tc_to_txq[TC_MAX_QUEUE];
         u8                      prio_tc_map[TC_BITMASK + 1];
 
@@ -2045,6 +2048,17 @@ int netdev_get_num_tc(struct net_device *dev)
         return dev->num_tc;
 }
 
+void netdev_unbind_sb_channel(struct net_device *dev,
+                              struct net_device *sb_dev);
+int netdev_bind_sb_channel_queue(struct net_device *dev,
+                                 struct net_device *sb_dev,
+                                 u8 tc, u16 count, u16 offset);
+int netdev_set_sb_channel(struct net_device *dev, u16 channel);
+static inline int netdev_get_sb_channel(struct net_device *dev)
+{
+        return max_t(int, -dev->num_tc, 0);
+}
+
 static inline
 struct netdev_queue *netdev_get_tx_queue(const struct net_device *dev,
                                          unsigned int index)