www.usr.com/support/gpl/USR9107_release.1.4.tar.gz

[bcm963xx.git] / kernel / linux / net / bridge / br_fdb.c

diff --git a/kernel/linux/net/bridge/br_fdb.c b/kernel/linux/net/bridge/br_fdb.c
index 9406999..35ecf0e 100755 (executable)
--- a/kernel/linux/net/bridge/br_fdb.c
+++ b/kernel/linux/net/bridge/br_fdb.c
@@ -80,6 +80,150 @@ static __inline__ void fdb_delete(struct net_bridge_fdb_entry *f)
        br_fdb_put(f);
 }
 
+
+#if defined(CONFIG_MIPS_BRCM)
+void dolist(struct net_bridge *br)
+{
+       struct net_bridge_mc_fdb_entry *dst;
+       struct list_head *lh;
+
+       
+       if (!br)
+           return;
+
+       printk("bridge  device  group                   source                  timeout\n");
+       list_for_each_rcu(lh, &br->mc_list) {
+           dst = (struct net_bridge_mc_fdb_entry *) list_entry(lh, struct net_bridge_mc_fdb_entry, list);
+           printk("%s  %s      ", br->dev->name, dst->dst->dev->name);
+           addr_debug(&dst->addr);
+           printk("    ");
+           addr_debug(&dst->host);
+           printk("    %d\n", (dst->tstamp - jiffies)/HZ);
+       }
+}
+
+int br_mc_fdb_update(struct net_bridge *br, struct net_bridge_port *prt, unsigned char *dest, unsigned char *host)
+{
+       struct net_bridge_mc_fdb_entry *dst;
+       struct list_head *lh;
+       int ret = 0;
+    
+       list_for_each_rcu(lh, &br->mc_list) {
+           dst = (struct net_bridge_mc_fdb_entry *) list_entry(lh, struct net_bridge_mc_fdb_entry, list);
+           if (!memcmp(&dst->addr, dest, ETH_ALEN)) {
+               dst->tstamp = jiffies + QUERY_TIMEOUT*HZ;
+               if (!memcmp(&dst->host, host, ETH_ALEN))
+                   ret = 1;
+           }
+       }
+       
+       return ret;
+}
+
+struct net_bridge_mc_fdb_entry *br_mc_fdb_get(struct net_bridge *br, struct net_bridge_port *prt, unsigned char *dest, unsigned char *host)
+{
+       struct net_bridge_mc_fdb_entry *dst;
+       struct list_head *lh;
+    
+       list_for_each_rcu(lh, &br->mc_list) {
+           dst = (struct net_bridge_mc_fdb_entry *) list_entry(lh, struct net_bridge_mc_fdb_entry, list);
+           if ((!memcmp(&dst->addr, dest, ETH_ALEN)) && (!memcmp(&dst->host, host, ETH_ALEN))) {
+               if (dst->dst == prt)
+                   return dst;
+           }
+       }
+       
+       return NULL;
+}
+
+mac_addr upnp_addr = {0x01, 0x00, 0x5e, 0x7f, 0xff, 0xfa};
+
+br_mc_fdb_add(struct net_bridge *br, struct net_bridge_port *prt, unsigned char *dest, unsigned char *host)
+{
+       struct net_bridge_mc_fdb_entry *mc_fdb;
+
+       //printk("--- add mc entry ---\n");
+
+       if (!memcmp(dest, &upnp_addr, ETH_ALEN))
+           return 0;
+           
+       if (br_mc_fdb_update(br, prt, dest, host))
+           return 0;
+           
+       mc_fdb = kmalloc(sizeof(struct net_bridge_mc_fdb_entry), GFP_KERNEL);
+       if (!mc_fdb)
+           return ENOMEM;
+       memcpy(mc_fdb->addr.addr, dest, ETH_ALEN);
+       memcpy(mc_fdb->host.addr, host, ETH_ALEN);
+       mc_fdb->dst = prt;
+       mc_fdb->tstamp = jiffies + QUERY_TIMEOUT*HZ;;
+       spin_lock_bh(&br->mcl_lock);
+       list_add_tail_rcu(&mc_fdb->list, &br->mc_list);
+       spin_unlock_bh(&br->mcl_lock);
+
+       if (!br->start_timer) {
+           init_timer(&br->igmp_timer);
+           br->igmp_timer.expires = jiffies + TIMER_CHECK_TIMEOUT*HZ;
+           br->igmp_timer.function = query_timeout;
+           br->igmp_timer.data = br;
+           add_timer(&br->igmp_timer);
+           br->start_timer = 1;
+       }
+
+       return 1;
+}
+
+br_mc_fdb_cleanup(struct net_bridge *br)
+{
+       struct net_bridge_mc_fdb_entry *dst;
+       struct list_head *lh;
+       struct list_head *tmp;
+    
+       spin_lock_bh(&br->mcl_lock);
+       list_for_each_safe_rcu(lh, tmp, &br->mc_list) {
+           dst = (struct net_bridge_mc_fdb_entry *) list_entry(lh, struct net_bridge_mc_fdb_entry, list);
+           list_del_rcu(&dst->list);
+           kfree(dst);
+       }
+       spin_unlock_bh(&br->mcl_lock);
+}
+
+br_mc_fdb_remove_grp(struct net_bridge *br, struct net_bridge_port *prt, unsigned char *dest)
+{
+       struct net_bridge_mc_fdb_entry *dst;
+       struct list_head *lh;
+       struct list_head *tmp;
+
+       spin_lock_bh(&br->mcl_lock);
+       list_for_each_safe_rcu(lh, tmp, &br->mc_list) {
+           dst = (struct net_bridge_mc_fdb_entry *) list_entry(lh, struct net_bridge_mc_fdb_entry, list);
+           if ((!memcmp(&dst->addr, dest, ETH_ALEN)) && (dst->dst == prt)) {
+               list_del_rcu(&dst->list);
+               kfree(dst);
+           }
+       }
+       spin_unlock_bh(&br->mcl_lock);
+}
+
+br_mc_fdb_remove(struct net_bridge *br, struct net_bridge_port *prt, unsigned char *dest, unsigned char *host)
+{
+       struct net_bridge_mc_fdb_entry *mc_fdb;
+
+       //printk("--- remove mc entry ---\n");
+       
+       if (mc_fdb = br_mc_fdb_get(br, prt, dest, host)) {
+           spin_lock_bh(&br->mcl_lock);
+           list_del_rcu(&mc_fdb->list);
+           kfree(mc_fdb);
+           spin_unlock_bh(&br->mcl_lock);
+
+           return 1;
+       }
+       
+       return 0;
+}
+#endif
+
 void br_fdb_changeaddr(struct net_bridge_port *p, const unsigned char *newaddr)
 {
        struct net_bridge *br = p->br;
@@ -297,11 +441,15 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source,
                                 */
                                if (is_local) 
                                        return 0;
-
+                                       
+#if 0                  /* Begin Broadcom commented out code */
+                                
                                if (net_ratelimit()) 
                                        printk(KERN_WARNING "%s: received packet with "
                                               " own address as source address\n",
                                               source->dev->name);
+                                              
+#endif                 /* End Broadcom commented out code */
                                return -EEXIST;
                        }