--- zzzz-none-000/linux-2.6.32.61/net/bridge/br_if.c 2013-06-10 09:43:48.000000000 +0000 +++ virian-300e-630/linux-2.6.32.61/net/bridge/br_if.c 2014-08-12 13:03:17.000000000 +0000 @@ -13,13 +13,17 @@ #include #include +#include +#include #include #include #include #include #include #include +#include #include +#include #include "br_private.h" @@ -31,20 +35,18 @@ */ static int port_cost(struct net_device *dev) { - if (dev->ethtool_ops && dev->ethtool_ops->get_settings) { - struct ethtool_cmd ecmd = { .cmd = ETHTOOL_GSET, }; + struct ethtool_cmd ecmd; - if (!dev->ethtool_ops->get_settings(dev, &ecmd)) { - switch(ecmd.speed) { - case SPEED_10000: - return 2; - case SPEED_1000: - return 4; - case SPEED_100: - return 19; - case SPEED_10: - return 100; - } + if (!dev_ethtool_get_settings(dev, &ecmd)) { + switch (ethtool_cmd_speed(&ecmd)) { + case SPEED_10000: + return 2; + case SPEED_1000: + return 4; + case SPEED_100: + return 19; + case SPEED_10: + return 100; } } @@ -59,30 +61,28 @@ } -/* - * Check for port carrier transistions. - * Called from work queue to allow for calling functions that - * might sleep (such as speed check), and to debounce. - */ +/* Check for port carrier transitions. */ void br_port_carrier_check(struct net_bridge_port *p) { struct net_device *dev = p->dev; struct net_bridge *br = p->br; - if (netif_carrier_ok(dev)) + if (!(p->flags & BR_ADMIN_COST) && + netif_running(dev) && netif_oper_up(dev)) p->path_cost = port_cost(dev); - if (netif_running(br->dev)) { - spin_lock_bh(&br->lock); - if (netif_carrier_ok(dev)) { - if (p->state == BR_STATE_DISABLED) - br_stp_enable_port(p); - } else { - if (p->state != BR_STATE_DISABLED) - br_stp_disable_port(p); - } - spin_unlock_bh(&br->lock); + if (!netif_running(br->dev)) + return; + + spin_lock_bh(&br->lock); + if (netif_running(dev) && netif_oper_up(dev)) { + if (p->state == BR_STATE_DISABLED) + br_stp_enable_port(p); + } else { + if (p->state != BR_STATE_DISABLED) + br_stp_disable_port(p); } + spin_unlock_bh(&br->lock); } static void release_nbp(struct kobject *kobj) @@ -131,7 +131,7 @@ struct net_bridge *br = p->br; struct net_device *dev = p->dev; - sysfs_remove_link(br->ifobj, dev->name); + sysfs_remove_link(br->ifobj, p->dev->name); dev_set_promiscuity(dev, -1); @@ -141,78 +141,56 @@ br_ifinfo_notify(RTM_DELLINK, p); + nbp_vlan_flush(p); br_fdb_delete_by_port(br, p, 1); list_del_rcu(&p->list); - rcu_assign_pointer(dev->br_port, NULL); + dev->priv_flags &= ~IFF_BRIDGE_PORT; + + netdev_rx_handler_unregister(dev); + +#if 0 + /* AVM: not present in 2.6.32, changed in 3.8, commits: + * 9ff162a8b96c96238773972e26288a366e403b0c net: introduce upper device lists + * 74fdd93fbcc16522406f65c564ea104490ad4908 bridge: remove usage of netdev_set_master() + * + * commits before: + * fbaec0ea54f7d9131891ff98744e82c073ce03b1 rtnetlink: implement setting of master device + * afc6151a78a43bdca5f64a8bd3e3c13837580c54 bridge: implement [add/del]_slave ops + */ + netdev_upper_dev_unlink(dev, br->dev); +#endif + + br_multicast_del_port(p); kobject_uevent(&p->kobj, KOBJ_REMOVE); kobject_del(&p->kobj); + br_netpoll_disable(p); + call_rcu(&p->rcu, destroy_nbp_rcu); } -/* called with RTNL */ -static void del_br(struct net_bridge *br) +/* Delete bridge device */ +void br_dev_delete(struct net_device *dev, struct list_head *head) { + struct net_bridge *br = netdev_priv(dev); struct net_bridge_port *p, *n; list_for_each_entry_safe(p, n, &br->port_list, list) { del_nbp(p); } + br_fdb_delete_by_port(br, NULL, 1); + + br_vlan_flush(br); del_timer_sync(&br->gc_timer); br_sysfs_delbr(br->dev); unregister_netdevice(br->dev); } -static struct net_device *new_bridge_dev(struct net *net, const char *name) -{ - struct net_bridge *br; - struct net_device *dev; - - dev = alloc_netdev(sizeof(struct net_bridge), name, - br_dev_setup); - - if (!dev) - return NULL; - dev_net_set(dev, net); - - br = netdev_priv(dev); - br->dev = dev; - - spin_lock_init(&br->lock); - INIT_LIST_HEAD(&br->port_list); - spin_lock_init(&br->hash_lock); - - br->bridge_id.prio[0] = 0x80; - br->bridge_id.prio[1] = 0x00; - - memcpy(br->group_addr, br_group_address, ETH_ALEN); - - br->feature_mask = dev->features; - br->stp_enabled = BR_NO_STP; - br->designated_root = br->bridge_id; - br->root_path_cost = 0; - br->root_port = 0; - 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->topology_change = 0; - br->topology_change_detected = 0; - br->ageing_time = 300 * HZ; - - br_netfilter_rtable_init(br); - - INIT_LIST_HEAD(&br->age_list); - - br_stp_timer_init(br); - - return dev; -} - /* find an available port number */ static int find_portno(struct net_bridge *br) { @@ -256,50 +234,40 @@ p->path_cost = port_cost(dev); p->priority = 0x8000 >> BR_PORT_BITS; p->port_no = index; - p->flags = 0; + p->flags = BR_LEARNING | BR_FLOOD; br_init_port(p); p->state = BR_STATE_DISABLED; br_stp_port_timer_init(p); + br_multicast_add_port(p); return p; } -static struct device_type br_type = { - .name = "bridge", -}; - int br_add_bridge(struct net *net, const char *name) { struct net_device *dev; - int ret; + int res; + + dev = alloc_netdev(sizeof(struct net_bridge), name, + br_dev_setup); - dev = new_bridge_dev(net, name); if (!dev) return -ENOMEM; - rtnl_lock(); - if (strchr(dev->name, '%')) { - ret = dev_alloc_name(dev, dev->name); - if (ret < 0) - goto out_free; - } - - SET_NETDEV_DEVTYPE(dev, &br_type); - - ret = register_netdevice(dev); - if (ret) - goto out_free; - - ret = br_sysfs_addbr(dev); - if (ret) - unregister_netdevice(dev); - out: - rtnl_unlock(); - return ret; + dev_net_set(dev, net); +#if 0 + /* AVM: not present in 2.6.32, added around 3.5 + * + * commit: + * 149ddd83a92b02c658d6c61f3276eb6500d585e8 bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2) + */ + dev->rtnl_link_ops = &br_link_ops; +#endif -out_free: - free_netdev(dev); - goto out; + res = register_netdev(dev); + if (res) + free_netdev(dev); + return res; } int br_del_bridge(struct net *net, const char *name) @@ -323,7 +291,7 @@ } else - del_br(netdev_priv(dev)); + br_dev_delete(dev, NULL); rtnl_unlock(); return ret; @@ -376,10 +344,12 @@ { struct net_bridge_port *p; int err = 0; + bool changed_addr; /* Don't allow bridging non-ethernet like devices */ if ((dev->flags & IFF_LOOPBACK) || - dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN) + dev->type != ARPHRD_ETHER || dev->addr_len != ETH_ALEN || + !is_valid_ether_addr(dev->dev_addr)) return -EINVAL; /* No bridging of bridges */ @@ -387,13 +357,29 @@ return -ELOOP; /* Device is already being bridged */ - if (dev->br_port != NULL) + if (br_port_exists(dev)) return -EBUSY; +#if 0 + /* AVM: IFF_DONT_BRIDGE is not present in 2.6.32, added in 2.6.33, commit: + * ad4bb6f8883a13bb0f65b194dae36c62a02ac779 cfg80211: disallow bridging managed/adhoc interfaces*/ + /* No bridging devices that dislike that (e.g. wireless) */ + if (dev->priv_flags & IFF_DONT_BRIDGE) + return -EOPNOTSUPP; +#endif + p = new_nbp(br, dev); if (IS_ERR(p)) return PTR_ERR(p); +#if 0 + /* AVM: NETDEV_JOIN not present in 2.6.32, added around 2.6.39, commits: + * 8d8fc29d02a33e4bd5f4fa47823c1fd386346093 netpoll: disable netpoll when enslave a device + * bb8ed6302b0613339c1a5f0a2cb0b3807c0af611 bridge: call NETDEV_JOIN notifiers when add a slave + */ + call_netdevice_notifiers(NETDEV_JOIN, dev); +#endif + err = dev_set_promiscuity(dev, 1); if (err) goto put_back; @@ -401,43 +387,89 @@ err = kobject_init_and_add(&p->kobj, &brport_ktype, &(dev->dev.kobj), SYSFS_BRIDGE_PORT_ATTR); if (err) - goto err0; - - err = br_fdb_insert(br, p, dev->dev_addr); - if (err) goto err1; err = br_sysfs_addif(p); if (err) goto err2; - rcu_assign_pointer(dev->br_port, p); + err = br_netpoll_enable(p); + if (err) + goto err3; + +#if 0 + /* AVM: not present in 2.6.32, changed in 3.8, commits: + * 9ff162a8b96c96238773972e26288a366e403b0c net: introduce upper device lists + * 74fdd93fbcc16522406f65c564ea104490ad4908 bridge: remove usage of netdev_set_master() + * + * commits before: + * fbaec0ea54f7d9131891ff98744e82c073ce03b1 rtnetlink: implement setting of master device + * afc6151a78a43bdca5f64a8bd3e3c13837580c54 bridge: implement [add/del]_slave ops + */ + err = netdev_master_upper_dev_link(dev, br->dev); + if (err) + goto err4; +#endif + + err = netdev_rx_handler_register(dev, br_handle_frame, p); + if (err) + goto err5; + + dev->priv_flags |= IFF_BRIDGE_PORT; + dev_disable_lro(dev); list_add_rcu(&p->list, &br->port_list); spin_lock_bh(&br->lock); - br_stp_recalculate_bridge_id(br); br_features_recompute(br); + spin_unlock_bh(&br->lock); + + if (br->dev->needed_headroom < dev->needed_headroom) + br->dev->needed_headroom = dev->needed_headroom; + + if (br_fdb_insert(br, p, dev->dev_addr, 0)) + netdev_err(dev, "failed insert local address bridge forwarding table\n"); + + spin_lock_bh(&br->lock); + changed_addr = br_stp_recalculate_bridge_id(br); - if ((dev->flags & IFF_UP) && netif_carrier_ok(dev) && + if (netif_running(dev) && netif_oper_up(dev) && (br->dev->flags & IFF_UP)) br_stp_enable_port(p); spin_unlock_bh(&br->lock); br_ifinfo_notify(RTM_NEWLINK, p); + if (changed_addr) + call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev); + dev_set_mtu(br->dev, br_min_mtu(br)); kobject_uevent(&p->kobj, KOBJ_ADD); return 0; + +err5: +#if 0 + /* AVM: not present in 2.6.32, changed in 3.8, commits: + * 9ff162a8b96c96238773972e26288a366e403b0c net: introduce upper device lists + * 74fdd93fbcc16522406f65c564ea104490ad4908 bridge: remove usage of netdev_set_master() + * + * commits before: + * fbaec0ea54f7d9131891ff98744e82c073ce03b1 rtnetlink: implement setting of master device + * afc6151a78a43bdca5f64a8bd3e3c13837580c54 bridge: implement [add/del]_slave ops + */ + netdev_upper_dev_unlink(dev, br->dev); +err4: +#endif + br_netpoll_disable(p); +err3: + sysfs_remove_link(br->ifobj, p->dev->name); err2: - br_fdb_delete_by_port(br, p, 1); -err1: kobject_put(&p->kobj); p = NULL; /* kobject_put frees */ -err0: +err1: dev_set_promiscuity(dev, -1); put_back: dev_put(dev); @@ -448,33 +480,29 @@ /* called with RTNL */ int br_del_if(struct net_bridge *br, struct net_device *dev) { - struct net_bridge_port *p = dev->br_port; + struct net_bridge_port *p; + bool changed_addr; + p = br_port_get_rtnl(dev); if (!p || p->br != br) return -EINVAL; + /* Since more than one interface can be attached to a bridge, + * there still maybe an alternate path for netconsole to use; + * therefore there is no reason for a NETDEV_RELEASE event. + */ del_nbp(p); spin_lock_bh(&br->lock); - br_stp_recalculate_bridge_id(br); - br_features_recompute(br); + changed_addr = br_stp_recalculate_bridge_id(br); spin_unlock_bh(&br->lock); - return 0; -} + if (changed_addr) + call_netdevice_notifiers(NETDEV_CHANGEADDR, br->dev); -void br_net_exit(struct net *net) -{ - struct net_device *dev; - - rtnl_lock(); -restart: - for_each_netdev(net, dev) { - if (dev->priv_flags & IFF_EBRIDGE) { - del_br(netdev_priv(dev)); - goto restart; - } - } - rtnl_unlock(); + spin_lock_bh(&br->lock); + br_features_recompute(br); + spin_unlock_bh(&br->lock); + return 0; }