diff options
| author | Maxime Chevallier <maxime.chevallier@bootlin.com> | 2018-07-12 14:54:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-13 03:30:48 +0300 |
| commit | e6e21c024272302ea4f0e397f044e2323035342f (patch) | |
| tree | 76c03dad15bad481749c06d39a818ac8b231a9b8 /drivers | |
| parent | 2a2f467daf96f519f9d2ec69e133ad1365d3e8ff (diff) | |
| download | linux-e6e21c024272302ea4f0e397f044e2323035342f.tar.xz | |
net: mvpp2: rename per-port RSS init function
mvpp22_init_rss function configures the RSS parameters for each port, so
rename it accordingly. Since this function relies on classifier
configuration, move its call right after the classifier config.
Signed-off-by: Maxime Chevallier <maxime.chevallier@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 2 | ||||
| -rw-r--r-- | drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c index f2bcfa8f1dfd..66160b9b8a9a 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c @@ -141,7 +141,7 @@ void mvpp22_rss_fill_table(struct mvpp2_port *port, u32 table) } } -void mvpp22_init_rss(struct mvpp2_port *port) +void mvpp22_rss_port_init(struct mvpp2_port *port) { struct mvpp2 *priv = port->priv; int i; diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h index 4c7be7469a92..38a8cf1172df 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h @@ -34,7 +34,7 @@ struct mvpp2_cls_lookup_entry { void mvpp22_rss_fill_table(struct mvpp2_port *port, u32 table); -void mvpp22_init_rss(struct mvpp2_port *port); +void mvpp22_rss_port_init(struct mvpp2_port *port); void mvpp2_cls_init(struct mvpp2 *priv); diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index f0b5fb78cd67..93e37d20899d 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c @@ -3373,9 +3373,6 @@ static int mvpp2_open(struct net_device *dev) mvpp2_start_dev(port); - if (mvpp22_rss_is_supported()) - mvpp22_init_rss(port); - /* Start hardware statistics gathering */ queue_delayed_work(priv->stats_queue, &port->stats_work, MVPP2_MIB_COUNTERS_STATS_DELAY); @@ -4153,6 +4150,9 @@ static int mvpp2_port_init(struct mvpp2_port *port) mvpp2_cls_oversize_rxq_set(port); mvpp2_cls_port_config(port); + if (mvpp22_rss_is_supported()) + mvpp22_rss_port_init(port); + /* Provide an initial Rx packet size */ port->pkt_size = MVPP2_RX_PKT_SIZE(port->dev->mtu); |