diff options
| author | Scott Feldman <sfeldma@gmail.com> | 2015-09-23 15:39:16 (GMT) |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-23 21:35:58 (GMT) |
| commit | a79e88d9fbbe2e3ecb9d883fb59dca7468d42d79 (patch) | |
| tree | 11f8eb0cff1df3e63179f09a9503c8a0ce779323 | |
| parent | 4c660496c95af93f3461c06d46fd33c0719625db (diff) | |
| download | linux-a79e88d9fbbe2e3ecb9d883fb59dca7468d42d79.tar.xz | |
bridge: define some min/max/default ageing time constants
Signed-off-by: Scott Feldman <sfeldma@gmail.com>
Acked-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/if_bridge.h | 6 | ||||
| -rw-r--r-- | net/bridge/br_device.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h index dad8b00..a338a68 100644 --- a/include/linux/if_bridge.h +++ b/include/linux/if_bridge.h @@ -46,6 +46,12 @@ 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 *)); typedef int br_should_route_hook_t(struct sk_buff *skb); diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c index 6ed2feb..2f81624 100644 --- a/net/bridge/br_device.c +++ b/net/bridge/br_device.c @@ -391,7 +391,7 @@ void br_dev_setup(struct net_device *dev) br->bridge_max_age = br->max_age = 20 * HZ; br->bridge_hello_time = br->hello_time = 2 * HZ; br->bridge_forward_delay = br->forward_delay = 15 * HZ; - br->ageing_time = 300 * HZ; + br->ageing_time = BR_DEFAULT_AGEING_TIME; br_netfilter_rtable_init(br); br_stp_timer_init(br); |