diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-10-19 11:03:06 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-19 11:03:06 -0700 |
| commit | 2e2d6f0342be7f73a34526077fa96f42f0e8c661 (patch) | |
| tree | 29f3740825a70aa606e03cf3a048d9a3a751529c /drivers/net/ethernet/mscc | |
| parent | rocker: Drop pointless static qualifier (diff) | |
| parent | Revert "bond: take rcu lock in netpoll_send_skb_on_dev" (diff) | |
| download | linux-dev-2e2d6f0342be7f73a34526077fa96f42f0e8c661.tar.xz linux-dev-2e2d6f0342be7f73a34526077fa96f42f0e8c661.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
net/sched/cls_api.c has overlapping changes to a call to
nlmsg_parse(), one (from 'net') added rtm_tca_policy instead of NULL
to the 5th argument, and another (from 'net-next') added cb->extack
instead of NULL to the 6th argument.
net/ipv4/ipmr_base.c is a case of a bug fix in 'net' being done to
code which moved (to mr_table_dump)) in 'net-next'. Thanks to David
Ahern for the heads up.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mscc')
| -rw-r--r-- | drivers/net/ethernet/mscc/ocelot.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c index 9b8a17ee3cb3..3238b9ee42f3 100644 --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c @@ -133,9 +133,9 @@ static inline int ocelot_vlant_wait_for_completion(struct ocelot *ocelot) { unsigned int val, timeout = 10; - /* Wait for the issued mac table command to be completed, or timeout. - * When the command read from ANA_TABLES_MACACCESS is - * MACACCESS_CMD_IDLE, the issued command completed successfully. + /* Wait for the issued vlan table command to be completed, or timeout. + * When the command read from ANA_TABLES_VLANACCESS is + * VLANACCESS_CMD_IDLE, the issued command completed successfully. */ do { val = ocelot_read(ocelot, ANA_TABLES_VLANACCESS); |