Commit 21acf630 authored by Samuel Mendoza-Jonas's avatar Samuel Mendoza-Jonas Committed by David S. Miller

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: default avatarSamuel Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8579a67e
...@@ -28,6 +28,8 @@ struct ncsi_dev { ...@@ -28,6 +28,8 @@ struct ncsi_dev {
}; };
#ifdef CONFIG_NET_NCSI #ifdef CONFIG_NET_NCSI
int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid);
int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid);
struct ncsi_dev *ncsi_register_dev(struct net_device *dev, struct ncsi_dev *ncsi_register_dev(struct net_device *dev,
void (*notifier)(struct ncsi_dev *nd)); void (*notifier)(struct ncsi_dev *nd));
int ncsi_start_dev(struct ncsi_dev *nd); int ncsi_start_dev(struct ncsi_dev *nd);
......
...@@ -180,6 +180,7 @@ struct ncsi_channel { ...@@ -180,6 +180,7 @@ struct ncsi_channel {
#define NCSI_CHANNEL_INACTIVE 1 #define NCSI_CHANNEL_INACTIVE 1
#define NCSI_CHANNEL_ACTIVE 2 #define NCSI_CHANNEL_ACTIVE 2
#define NCSI_CHANNEL_INVISIBLE 3 #define NCSI_CHANNEL_INVISIBLE 3
bool reconfigure_needed;
spinlock_t lock; /* Protect filters etc */ spinlock_t lock; /* Protect filters etc */
struct ncsi_package *package; struct ncsi_package *package;
struct ncsi_channel_version version; struct ncsi_channel_version version;
...@@ -235,6 +236,9 @@ enum { ...@@ -235,6 +236,9 @@ enum {
ncsi_dev_state_probe_dp, ncsi_dev_state_probe_dp,
ncsi_dev_state_config_sp = 0x0301, ncsi_dev_state_config_sp = 0x0301,
ncsi_dev_state_config_cis, 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_sma,
ncsi_dev_state_config_ebf, ncsi_dev_state_config_ebf,
#if IS_ENABLED(CONFIG_IPV6) #if IS_ENABLED(CONFIG_IPV6)
...@@ -253,6 +257,12 @@ enum { ...@@ -253,6 +257,12 @@ enum {
ncsi_dev_state_suspend_done ncsi_dev_state_suspend_done
}; };
struct vlan_vid {
struct list_head list;
__be16 proto;
u16 vid;
};
struct ncsi_dev_priv { struct ncsi_dev_priv {
struct ncsi_dev ndev; /* Associated NCSI device */ struct ncsi_dev ndev; /* Associated NCSI device */
unsigned int flags; /* NCSI device flags */ unsigned int flags; /* NCSI device flags */
...@@ -276,6 +286,7 @@ struct ncsi_dev_priv { ...@@ -276,6 +286,7 @@ struct ncsi_dev_priv {
struct work_struct work; /* For channel management */ struct work_struct work; /* For channel management */
struct packet_type ptype; /* NCSI packet Rx handler */ struct packet_type ptype; /* NCSI packet Rx handler */
struct list_head node; /* Form NCSI device list */ struct list_head node; /* Form NCSI device list */
struct list_head vlan_vids; /* List of active VLAN IDs */
}; };
struct ncsi_cmd_arg { struct ncsi_cmd_arg {
......
This diff is collapsed.
...@@ -694,7 +694,14 @@ static int ncsi_rsp_handler_gc(struct ncsi_request *nr) ...@@ -694,7 +694,14 @@ static int ncsi_rsp_handler_gc(struct ncsi_request *nr)
ncf->index = i; ncf->index = i;
ncf->total = cnt; ncf->total = cnt;
if (i == NCSI_FILTER_VLAN) {
/* Set VLAN filters active so they are cleared in
* first configuration state
*/
ncf->bitmap = U64_MAX;
} else {
ncf->bitmap = 0x0ul; ncf->bitmap = 0x0ul;
}
nc->filters[i] = ncf; nc->filters[i] = ncf;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment