1 files changed, 24 insertions, 17 deletions

diff --git a/include/linux/if_team.h b/include/linux/if_team.h
index 6960fc1841a7..6d88a7f57680 100644
--- a/include/linux/if_team.h
+++ b/include/linux/if_team.h
@@ -67,6 +67,9 @@ struct team_port {
         struct netpoll *np;
 #endif
 
+        s32 priority; /* lower number ~ higher priority */
+        u16 queue_id;
+        struct list_head qom_list; /* node in queue override mapping list */
         long mode_priv[0];
 };
 
@@ -96,21 +99,6 @@ static inline void team_netpoll_send_skb(struct team_port *port,
 }
 #endif
 
-static inline int team_dev_queue_xmit(struct team *team, struct team_port *port,
-                                      struct sk_buff *skb)
-{
-        BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
-                     sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
-        skb_set_queue_mapping(skb, qdisc_skb_cb(skb)->slave_dev_queue_mapping);
-
-        skb->dev = port->dev;
-        if (unlikely(netpoll_tx_running(port->dev))) {
-                team_netpoll_send_skb(port, skb);
-                return 0;
-        }
-        return dev_queue_xmit(skb);
-}
-
 struct team_mode_ops {
         int (*init)(struct team *team);
         void (*exit)(struct team *team);
@@ -120,7 +108,7 @@ struct team_mode_ops {
         bool (*transmit)(struct team *team, struct sk_buff *skb);
         int (*port_enter)(struct team *team, struct team_port *port);
         void (*port_leave)(struct team *team, struct team_port *port);
-        void (*port_change_mac)(struct team *team, struct team_port *port);
+        void (*port_change_dev_addr)(struct team *team, struct team_port *port);
         void (*port_enabled)(struct team *team, struct team_port *port);
         void (*port_disabled)(struct team *team, struct team_port *port);
 };
@@ -130,6 +118,7 @@ enum team_option_type {
         TEAM_OPTION_TYPE_STRING,
         TEAM_OPTION_TYPE_BINARY,
         TEAM_OPTION_TYPE_BOOL,
+        TEAM_OPTION_TYPE_S32,
 };
 
 struct team_option_inst_info {
@@ -146,6 +135,7 @@ struct team_gsetter_ctx {
                         u32 len;
                 } bin_val;
                 bool bool_val;
+                s32 s32_val;
         } data;
         struct team_option_inst_info *info;
 };
@@ -197,9 +187,26 @@ struct team {
 
         const struct team_mode *mode;
         struct team_mode_ops ops;
+        bool queue_override_enabled;
+        struct list_head *qom_lists; /* array of queue override mapping lists */
         long mode_priv[TEAM_MODE_PRIV_LONGS];
 };
 
+static inline int team_dev_queue_xmit(struct team *team, struct team_port *port,
+                                      struct sk_buff *skb)
+{
+        BUILD_BUG_ON(sizeof(skb->queue_mapping) !=
+                     sizeof(qdisc_skb_cb(skb)->slave_dev_queue_mapping));
+        skb_set_queue_mapping(skb, qdisc_skb_cb(skb)->slave_dev_queue_mapping);
+
+        skb->dev = port->dev;
+        if (unlikely(netpoll_tx_running(team->dev))) {
+                team_netpoll_send_skb(port, skb);
+                return 0;
+        }
+        return dev_queue_xmit(skb);
+}
+
 static inline struct hlist_head *team_port_index_hash(struct team *team,
                                                       int port_index)
 {
@@ -231,7 +238,7 @@ static inline struct team_port *team_get_port_by_index_rcu(struct team *team,
         return NULL;
 }
 
-extern int team_port_set_team_mac(struct team_port *port);
+extern int team_port_set_team_dev_addr(struct team_port *port);
 extern int team_options_register(struct team *team,
                                  const struct team_option *option,
                                  size_t option_count);