[Bridge] [PATCH] bridge: flush forwarding table when device carrier off

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Is this patch submitted into kernel tree? What version of kernel will have
this patch applied (thinking on 2.6.x and 2.4.x branchs)?

Thanks

El Jue, 12 de Octubre de 2006, 20:24, Stephen Hemminger escribió:
> Flush the forwarding table when carrier is lost. This helps for
> availability because we don't want to forward to a downed device and
> new packets may come in on other links.
>
> Signed-off-by: Stephen Hemminger <shemminger at osdl.org>
> ---
>  net/bridge/br_fdb.c     |    7 ++++++-
>  net/bridge/br_if.c      |    4 ++--
>  net/bridge/br_private.h |    2 +-
>  net/bridge/br_stp_if.c  |    2 ++
>  4 files changed, 11 insertions(+), 4 deletions(-)
>
> --- bridge.orig/net/bridge/br_fdb.c
> +++ bridge/net/bridge/br_fdb.c
> @@ -128,7 +128,10 @@ void br_fdb_cleanup(unsigned long _data)
>  	mod_timer(&br->gc_timer, jiffies + HZ/10);
>  }
>
> -void br_fdb_delete_by_port(struct net_bridge *br, struct net_bridge_port
> *p)
> +
> +void br_fdb_delete_by_port(struct net_bridge *br,
> +			   const struct net_bridge_port *p,
> +			   int do_all)
>  {
>  	int i;
>
> @@ -142,6 +145,8 @@ void br_fdb_delete_by_port(struct net_br
>  			if (f->dst != p)
>  				continue;
>
> +			if (f->is_static & !do_all)
> +				continue;
>  			/*
>  			 * if multiple ports all have the same device address
>  			 * then when one port is deleted, assign
> --- bridge.orig/net/bridge/br_if.c
> +++ bridge/net/bridge/br_if.c
> @@ -163,7 +163,7 @@ static void del_nbp(struct net_bridge_po
>  	br_stp_disable_port(p);
>  	spin_unlock_bh(&br->lock);
>
> -	br_fdb_delete_by_port(br, p);
> +	br_fdb_delete_by_port(br, p, 1);
>
>  	list_del_rcu(&p->list);
>
> @@ -448,7 +448,7 @@ int br_add_if(struct net_bridge *br, str
>
>  	return 0;
>  err2:
> -	br_fdb_delete_by_port(br, p);
> +	br_fdb_delete_by_port(br, p, 1);
>  err1:
>  	kobject_del(&p->kobj);
>  err0:
> --- bridge.orig/net/bridge/br_private.h
> +++ bridge/net/bridge/br_private.h
> @@ -143,7 +143,7 @@ extern void br_fdb_changeaddr(struct net
>  			      const unsigned char *newaddr);
>  extern void br_fdb_cleanup(unsigned long arg);
>  extern void br_fdb_delete_by_port(struct net_bridge *br,
> -			   struct net_bridge_port *p);
> +				  const struct net_bridge_port *p, int do_all);
>  extern struct net_bridge_fdb_entry *__br_fdb_get(struct net_bridge *br,
>  						 const unsigned char *addr);
>  extern struct net_bridge_fdb_entry *br_fdb_get(struct net_bridge *br,
> --- bridge.orig/net/bridge/br_stp_if.c
> +++ bridge/net/bridge/br_stp_if.c
> @@ -113,6 +113,8 @@ void br_stp_disable_port(struct net_brid
>  	del_timer(&p->forward_delay_timer);
>  	del_timer(&p->hold_timer);
>
> +	br_fdb_delete_by_port(br, p, 0);
> +
>  	br_configuration_update(br);
>
>  	br_port_state_selection(br);
> _______________________________________________
> Bridge mailing list
> Bridge at lists.osdl.org
> https://lists.osdl.org/mailman/listinfo/bridge
>




[Index of Archives]     [Netdev]     [AoE Tools]     [Linux Wireless]     [Kernel Newbies]     [Security]     [Linux for Hams]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux RAID]     [Linux Admin]     [Samba]     [Video 4 Linux]

  Powered by Linux