diff options
author | Yousong Zhou <yszhou4tech@gmail.com> | 2020-02-06 17:11:39 +0800 |
---|---|---|
committer | Yousong Zhou <yszhou4tech@gmail.com> | 2020-03-03 23:06:00 +0800 |
commit | 2408f2f08fede7c0a7390da442d164c67df152b3 (patch) | |
tree | 608c21f700ac211cdcfd5fdc48abeae4d4f03597 /target/linux/ramips/files-4.14/drivers/net/ethernet | |
parent | 0493d57e04774d47921a7d2014b567455d5dc16b (diff) | |
download | upstream-2408f2f08fede7c0a7390da442d164c67df152b3.tar.gz upstream-2408f2f08fede7c0a7390da442d164c67df152b3.tar.bz2 upstream-2408f2f08fede7c0a7390da442d164c67df152b3.zip |
ramips: mt7530: remove redundant global attrs for port mirroring
Global attributes enable_mirror_tx/enable_mirror_rx depend on runtime
value of another global attribute mirror_source_port which just resides
in the memory
The same functionality can be achieved by directly setting port
attribute of the same names. E.g. the following two groups of commands
achieve the same thing
swconfig dev switch0 set mirror_source_port 3
swconfig dev switch0 set enable_mirror_tx 1
swconfig dev switch0 set mirror_source_port 4
swconfig dev switch0 set enable_mirror_tx 1
swconfig dev switch0 port 3 set enable_mirror_tx 1
swconfig dev switch0 port 4 set enable_mirror_tx 1
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
Diffstat (limited to 'target/linux/ramips/files-4.14/drivers/net/ethernet')
-rw-r--r-- | target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c | 88 |
1 files changed, 0 insertions, 88 deletions
diff --git a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c index 9acea3bc84..8ffd614d9f 100644 --- a/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c +++ b/target/linux/ramips/files-4.14/drivers/net/ethernet/mediatek/mt7530.c @@ -208,7 +208,6 @@ struct mt7530_priv { struct mii_bus *bus; struct switch_dev swdev; - u8 mirror_src_port; u8 mirror_dest_port; bool global_vlan_enable; struct mt7530_vlan_entry vlan_entries[MT7530_NUM_VLANS]; @@ -520,50 +519,6 @@ mt7530_get_vid(struct switch_dev *dev, const struct switch_attr *attr, } static int -mt7530_get_mirror_rx_enable(struct switch_dev *dev, const struct switch_attr *attr, - struct switch_val *val) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - val->value.i = priv->port_entries[priv->mirror_src_port].mirror_rx; - - return 0; -} - -static int -mt7530_set_mirror_rx_enable(struct switch_dev *dev, const struct switch_attr *attr, - struct switch_val *val) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - priv->port_entries[priv->mirror_src_port].mirror_rx = val->value.i; - - return 0; -} - -static int -mt7530_get_mirror_tx_enable(struct switch_dev *dev, const struct switch_attr *attr, - struct switch_val *val) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - val->value.i = priv->port_entries[priv->mirror_src_port].mirror_tx; - - return 0; -} - -static int -mt7530_set_mirror_tx_enable(struct switch_dev *dev, const struct switch_attr *attr, - struct switch_val *val) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - priv->port_entries[priv->mirror_src_port].mirror_tx = val->value.i; - - return 0; -} - -static int mt7530_get_mirror_monitor_port(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { @@ -586,28 +541,6 @@ mt7530_set_mirror_monitor_port(struct switch_dev *dev, const struct switch_attr } static int -mt7530_get_mirror_source_port(struct switch_dev *dev, const struct switch_attr *attr, - struct switch_val *val) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - val->value.i = priv->mirror_src_port; - - return 0; -} - -static int -mt7530_set_mirror_source_port(struct switch_dev *dev, const struct switch_attr *attr, - struct switch_val *val) -{ - struct mt7530_priv *priv = container_of(dev, struct mt7530_priv, swdev); - - priv->mirror_src_port = val->value.i; - - return 0; -} - -static int mt7530_get_port_mirror_rx(struct switch_dev *dev, const struct switch_attr *attr, struct switch_val *val) { @@ -1004,32 +937,11 @@ static const struct switch_attr mt7530_global[] = { .set = NULL, }, { .type = SWITCH_TYPE_INT, - .name = "enable_mirror_rx", - .description = "Enable mirroring of RX packets", - .set = mt7530_set_mirror_rx_enable, - .get = mt7530_get_mirror_rx_enable, - .max = 1 - }, { - .type = SWITCH_TYPE_INT, - .name = "enable_mirror_tx", - .description = "Enable mirroring of TX packets", - .set = mt7530_set_mirror_tx_enable, - .get = mt7530_get_mirror_tx_enable, - .max = 1 - }, { - .type = SWITCH_TYPE_INT, .name = "mirror_monitor_port", .description = "Mirror monitor port", .set = mt7530_set_mirror_monitor_port, .get = mt7530_get_mirror_monitor_port, .max = MT7530_NUM_PORTS - 1 - }, { - .type = SWITCH_TYPE_INT, - .name = "mirror_source_port", - .description = "Mirror source port", - .set = mt7530_set_mirror_source_port, - .get = mt7530_get_mirror_source_port, - .max = MT7530_NUM_PORTS - 1 }, }; |