diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-11 14:59:55 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-11 14:59:55 -0500 |
| commit | 5390dba1a5390c9724db5c5714506301dfe31a7b (patch) | |
| tree | 02e8b364036b21cb569d138aaa52e0d70f0e27e9 /drivers/net/ethernet/rocker/rocker_main.c | |
| parent | 8e2ad4113ce4671686740f808ff2795395c39eef (diff) | |
| parent | 4c656c13b254d598e83e586b7b4d36a2043dad85 (diff) | |
Merge branch 'bridge_ageing_time'
Stephen Hemminger says:
====================
bridge: ageing timer regression fix
This fixes regression in how ageing timer is managed.
Backing out the change required fixing switch drivers as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rocker/rocker_main.c')
| -rw-r--r-- | drivers/net/ethernet/rocker/rocker_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/rocker/rocker_main.c b/drivers/net/ethernet/rocker/rocker_main.c index 28b775e5a9ad..c8b1bf474e89 100644 --- a/drivers/net/ethernet/rocker/rocker_main.c +++ b/drivers/net/ethernet/rocker/rocker_main.c @@ -2733,6 +2733,8 @@ static int rocker_probe(struct pci_dev *pdev, const struct pci_device_id *id) rocker->hw.id = rocker_read64(rocker, SWITCH_ID); + rocker->ageing_time = BR_DEFAULT_AGEING_TIME; + err = rocker_probe_ports(rocker); if (err) { dev_err(&pdev->dev, "failed to probe ports\n"); |