Skip to content

Commit

Permalink
net: mvpp2: rename per-port RSS init function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Maxime Chevallier authored and David S. Miller committed Jul 13, 2018
1 parent 2a2f467 commit e6e21c0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit e6e21c0

Please sign in to comment.