diff options
author | David S. Miller <davem@davemloft.net> | 2016-03-11 20:59:55 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-11 20:59:55 +0100 |
commit | 5390dba1a5390c9724db5c5714506301dfe31a7b (patch) | |
tree | 02e8b364036b21cb569d138aaa52e0d70f0e27e9 /drivers/net/ethernet/cisco/enic | |
parent | macvtap: always pass ethernet header in linear (diff) | |
parent | bridge: allow zero ageing time (diff) | |
download | linux-5390dba1a5390c9724db5c5714506301dfe31a7b.tar.xz linux-5390dba1a5390c9724db5c5714506301dfe31a7b.zip |
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/cisco/enic')
0 files changed, 0 insertions, 0 deletions