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 /include/linux/if_bridge.h | |
| 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 'include/linux/if_bridge.h')
| -rw-r--r-- | include/linux/if_bridge.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index a338a688ee4a..dcb89e3515db 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -46,10 +46,6 @@ struct br_ip_list { #define BR_LEARNING_SYNC BIT(9) #define BR_PROXYARP_WIFI BIT(10) -/* values as per ieee8021QBridgeFdbAgingTime */ -#define BR_MIN_AGEING_TIME (10 * HZ) -#define BR_MAX_AGEING_TIME (1000000 * HZ) - #define BR_DEFAULT_AGEING_TIME (300 * HZ) extern void brioctl_set(int (*ioctl_hook)(struct net *, unsigned int, void __user *)); |