From: fendo Date: Wed, 24 Apr 2013 20:42:38 +0000 (+0200) Subject: Merge branch 'master' into samesversion X-Git-Tag: 2.2.1-2sames3.8~2 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/12835e031e502885bce44c5e6b59fa12e0564ca0?hp=--cc Merge branch 'master' into samesversion --- 12835e031e502885bce44c5e6b59fa12e0564ca0 diff --cc l2tpns.c index 17c440b,55621a5..84bb7a7 --- a/l2tpns.c +++ b/l2tpns.c @@@ -182,7 -186,7 +183,8 @@@ config_descriptt config_values[] = CONFIG("disable_sending_hello", disable_sending_hello, BOOL), CONFIG("disable_no_spoof", disable_no_spoof, BOOL), CONFIG("bind_multi_address", bind_multi_address, STRING), + CONFIG("grp_txrate_average_time", grp_txrate_average_time, INT), + CONFIG("pppoe_only_equal_svc_name", pppoe_only_equal_svc_name, BOOL), { NULL, 0, 0, 0 } };