net/ncsi: Configure VLAN tag filter

Make use of the ndo_vlan_rx_{add,kill}_vid callbacks to have the NCSI
stack process new VLAN tags and configure the channel VLAN filter
appropriately.
Several VLAN tags can be set and a "Set VLAN Filter" packet must be sent
for each one, meaning the ncsi_dev_state_config_svf state must be
repeated. An internal list of VLAN tags is maintained, and compared
against the current channel's ncsi_channel_filter in order to keep track
within the state. VLAN filters are removed in a similar manner, with the
introduction of the ncsi_dev_state_config_clear_vids state. The maximum
number of VLAN tag filters is determined by the "Get Capabilities"
response from the channel.

Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 0 deletions

diff --git a/net/ncsi/internal.h b/net/ncsi/internal.h
index 1308a56f2591..af3d636534ef 100644
--- a/net/ncsi/internal.h
+++ b/net/ncsi/internal.h
@@ -180,6 +180,7 @@ struct ncsi_channel {
 #define NCSI_CHANNEL_INACTIVE           1
 #define NCSI_CHANNEL_ACTIVE             2
 #define NCSI_CHANNEL_INVISIBLE          3
+        bool                        reconfigure_needed;
         spinlock_t                  lock;       /* Protect filters etc */
         struct ncsi_package         *package;
         struct ncsi_channel_version version;
@@ -235,6 +236,9 @@ enum {
         ncsi_dev_state_probe_dp,
         ncsi_dev_state_config_sp        = 0x0301,
         ncsi_dev_state_config_cis,
+        ncsi_dev_state_config_clear_vids,
+        ncsi_dev_state_config_svf,
+        ncsi_dev_state_config_ev,
         ncsi_dev_state_config_sma,
         ncsi_dev_state_config_ebf,
 #if IS_ENABLED(CONFIG_IPV6)
@@ -253,6 +257,12 @@ enum {
         ncsi_dev_state_suspend_done
 };
 
+struct vlan_vid {
+        struct list_head list;
+        __be16 proto;
+        u16 vid;
+};
+
 struct ncsi_dev_priv {
         struct ncsi_dev     ndev;            /* Associated NCSI device     */
         unsigned int        flags;           /* NCSI device flags          */
@@ -276,6 +286,7 @@ struct ncsi_dev_priv {
         struct work_struct  work;            /* For channel management     */
         struct packet_type  ptype;           /* NCSI packet Rx handler     */
         struct list_head    node;            /* Form NCSI device list      */
+        struct list_head    vlan_vids;       /* List of active VLAN IDs */
 };
 
 struct ncsi_cmd_arg {