Message ID | 1442606151-50429-4-git-send-email-sfeldma@gmail.com |
---|---|
State | Superseded, archived |
Delegated to: | David Miller |
Headers | show |
Fri, Sep 18, 2015 at 09:55:47PM CEST, sfeldma@gmail.com wrote: >From: Scott Feldman <sfeldma@gmail.com> > >Follow-up patcheset will allow user to change ageing_time, but for now >just hard-code it to a fixed value (the same value used as the default >for the bridge driver). > >Signed-off-by: Scott Feldman <sfeldma@gmail.com> >--- > drivers/net/ethernet/rocker/rocker.c | 2 ++ > 1 file changed, 2 insertions(+) > >diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c >index f55ed2c..eba22f5 100644 >--- a/drivers/net/ethernet/rocker/rocker.c >+++ b/drivers/net/ethernet/rocker/rocker.c >@@ -221,6 +221,7 @@ struct rocker_port { > __be16 internal_vlan_id; > int stp_state; > u32 brport_flags; >+ unsigned long ageing_time; > bool ctrls[ROCKER_CTRL_MAX]; > unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN]; > struct napi_struct napi_tx; >@@ -4975,6 +4976,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) > rocker_port->port_number = port_number; > rocker_port->pport = port_number + 1; > rocker_port->brport_flags = BR_LEARNING | BR_LEARNING_SYNC; >+ rocker_port->ageing_time = 300 * HZ; How about to add also "BR_DEFAULT_AGEING_TIME" and use it here? > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Sep 18, 2015 at 11:30 PM, Jiri Pirko <jiri@resnulli.us> wrote: > Fri, Sep 18, 2015 at 09:55:47PM CEST, sfeldma@gmail.com wrote: >>From: Scott Feldman <sfeldma@gmail.com> >> >>Follow-up patcheset will allow user to change ageing_time, but for now >>just hard-code it to a fixed value (the same value used as the default >>for the bridge driver). >> >>Signed-off-by: Scott Feldman <sfeldma@gmail.com> >>--- >> drivers/net/ethernet/rocker/rocker.c | 2 ++ >> 1 file changed, 2 insertions(+) >> >>diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c >>index f55ed2c..eba22f5 100644 >>--- a/drivers/net/ethernet/rocker/rocker.c >>+++ b/drivers/net/ethernet/rocker/rocker.c >>@@ -221,6 +221,7 @@ struct rocker_port { >> __be16 internal_vlan_id; >> int stp_state; >> u32 brport_flags; >>+ unsigned long ageing_time; >> bool ctrls[ROCKER_CTRL_MAX]; >> unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN]; >> struct napi_struct napi_tx; >>@@ -4975,6 +4976,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) >> rocker_port->port_number = port_number; >> rocker_port->pport = port_number + 1; >> rocker_port->brport_flags = BR_LEARNING | BR_LEARNING_SYNC; >>+ rocker_port->ageing_time = 300 * HZ; > > How about to add also "BR_DEFAULT_AGEING_TIME" and use it here? Yes, added for v2 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/rocker/rocker.c b/drivers/net/ethernet/rocker/rocker.c index f55ed2c..eba22f5 100644 --- a/drivers/net/ethernet/rocker/rocker.c +++ b/drivers/net/ethernet/rocker/rocker.c @@ -221,6 +221,7 @@ struct rocker_port { __be16 internal_vlan_id; int stp_state; u32 brport_flags; + unsigned long ageing_time; bool ctrls[ROCKER_CTRL_MAX]; unsigned long vlan_bitmap[ROCKER_VLAN_BITMAP_LEN]; struct napi_struct napi_tx; @@ -4975,6 +4976,7 @@ static int rocker_probe_port(struct rocker *rocker, unsigned int port_number) rocker_port->port_number = port_number; rocker_port->pport = port_number + 1; rocker_port->brport_flags = BR_LEARNING | BR_LEARNING_SYNC; + rocker_port->ageing_time = 300 * HZ; INIT_LIST_HEAD(&rocker_port->trans_mem); rocker_port_dev_addr_init(rocker_port);