--- zzzz-none-000/linux-2.6.32.61/net/bridge/br_device.c 2013-06-10 09:43:48.000000000 +0000 +++ ar9-7330-650/linux-2.6.32.61/net/bridge/br_device.c 2015-06-22 12:19:10.000000000 +0000 @@ -13,35 +13,83 @@ #include #include +#include #include #include +#include +#include #include #include "br_private.h" -/* net device transmit always called with no BH (preempt_disabled) */ +#define COMMON_FEATURES (NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | \ + NETIF_F_GSO_MASK | NETIF_F_HW_CSUM | NETIF_F_GSO) + + +/* net device transmit always called with BH disabled */ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); const unsigned char *dest = skb->data; struct net_bridge_fdb_entry *dst; + struct net_bridge_mdb_entry *mdst; + u16 vid = 0; + + BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct br_input_skb_cb)); + + rcu_read_lock(); +#ifdef CONFIG_BRIDGE_NETFILTER + if (skb->nf_bridge && (skb->nf_bridge->mask & BRNF_BRIDGED_DNAT)) { + br_nf_pre_routing_finish_bridge_slow(skb); + rcu_read_unlock(); + return NETDEV_TX_OK; + } +#endif dev->stats.tx_packets++; dev->stats.tx_bytes += skb->len; + BR_INPUT_SKB_CB(skb)->brdev = dev; + skb_reset_mac_header(skb); skb_pull(skb, ETH_HLEN); - if (dest[0] & 1) - br_flood_deliver(br, skb); - else if ((dst = __br_fdb_get(br, dest)) != NULL) + if (!br_allowed_ingress(br, br_get_vlan_info(br), skb, &vid)) + goto out; + + if (is_broadcast_ether_addr(dest)) + br_flood_deliver(br, skb, false); + else if (is_multicast_ether_addr(dest)) { + if (unlikely(netpoll_tx_running(dev))) { + br_flood_deliver(br, skb, false); + goto out; + } + if (br_multicast_rcv(br, NULL, skb, vid)) { + kfree_skb(skb); + goto out; + } + + mdst = br_mdb_get(br, skb, vid); + if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) && + br_multicast_querier_exists(br, eth_hdr(skb))) + br_multicast_deliver(mdst, skb); + else + br_flood_deliver(br, skb, false); + } else if ((dst = __br_fdb_get(br, dest, vid)) != NULL) br_deliver(dst->dst, skb); else - br_flood_deliver(br, skb); + br_flood_deliver(br, skb, true); +out: + rcu_read_unlock(); return NETDEV_TX_OK; } +static int br_dev_init(struct net_device *dev) +{ + return 0; +} + static int br_dev_open(struct net_device *dev) { struct net_bridge *br = netdev_priv(dev); @@ -49,6 +97,7 @@ br_features_recompute(br); netif_start_queue(dev); br_stp_enable_bridge(br); + br_multicast_open(br); return 0; } @@ -59,25 +108,12 @@ static int br_dev_stop(struct net_device *dev) { - br_stp_disable_bridge(netdev_priv(dev)); - - netif_stop_queue(dev); - - return 0; -} - -static int br_change_mtu(struct net_device *dev, int new_mtu) -{ struct net_bridge *br = netdev_priv(dev); - if (new_mtu < 68 || new_mtu > br_min_mtu(br)) - return -EINVAL; - dev->mtu = new_mtu; + br_stp_disable_bridge(br); + br_multicast_stop(br); -#ifdef CONFIG_BRIDGE_NETFILTER - /* remember the MTU in the rtable for PMTU */ - br->fake_rtable.u.dst.metrics[RTAX_MTU - 1] = new_mtu; -#endif + netif_stop_queue(dev); return 0; } @@ -89,12 +125,13 @@ struct sockaddr *addr = p; if (!is_valid_ether_addr(addr->sa_data)) - return -EINVAL; + return -EADDRNOTAVAIL; spin_lock_bh(&br->lock); - memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); - br_stp_change_bridge_id(br, addr->sa_data); - br->flags |= BR_SET_MAC_ADDR; + if (compare_ether_addr(dev->dev_addr, addr->sa_data)) { + /* Mac address will be changed in br_stp_change_bridge_id(). */ + br_stp_change_bridge_id(br, addr->sa_data); + } spin_unlock_bh(&br->lock); return 0; @@ -102,10 +139,129 @@ static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "bridge"); - strcpy(info->version, BR_VERSION); - strcpy(info->fw_version, "N/A"); - strcpy(info->bus_info, "N/A"); + strlcpy(info->driver, "bridge", sizeof(info->driver)); + strlcpy(info->version, BR_VERSION, sizeof(info->version)); + strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strlcpy(info->bus_info, "N/A", sizeof(info->bus_info)); +} + +#ifdef CONFIG_NET_POLL_CONTROLLER +static void br_poll_controller(struct net_device *br_dev) +{ +} + +static void br_netpoll_cleanup(struct net_device *dev) +{ + struct net_bridge *br = netdev_priv(dev); + struct net_bridge_port *p; + + list_for_each_entry(p, &br->port_list, list) + br_netpoll_disable(p); +} + +static int __br_netpoll_enable(struct net_bridge_port *p) +{ + struct netpoll *np; + int err; + + np = kzalloc(sizeof(*p->np), GFP_KERNEL); + if (!np) + return -ENOMEM; + + err = __netpoll_setup(np, p->dev); + if (err) { + kfree(np); + return err; + } + + p->np = np; + return err; +} + +int br_netpoll_enable(struct net_bridge_port *p) +{ + if (!p->br->dev->npinfo) + return 0; + + return __br_netpoll_enable(p); +} + +static int br_netpoll_setup(struct net_device *dev, struct netpoll_info *ni) +{ + struct net_bridge *br = netdev_priv(dev); + struct net_bridge_port *p; + int err = 0; + + list_for_each_entry(p, &br->port_list, list) { + if (!p->dev) + continue; + err = __br_netpoll_enable(p); + if (err) + goto fail; + } + +out: + return err; + +fail: + br_netpoll_cleanup(dev); + goto out; +} + +void br_netpoll_disable(struct net_bridge_port *p) +{ + struct netpoll *np = p->np; + + if (!np) + return; + + p->np = NULL; + + __netpoll_free_async(np); +} + +#endif + +#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 + */ +static int br_add_slave(struct net_device *dev, struct net_device *slave_dev) + +{ + struct net_bridge *br = netdev_priv(dev); + + return br_add_if(br, slave_dev); +} + +static int br_del_slave(struct net_device *dev, struct net_device *slave_dev) +{ + struct net_bridge *br = netdev_priv(dev); + + return br_del_if(br, slave_dev); +} +#endif + + +static int br_change_mtu(struct net_device *dev, int new_mtu) +{ + struct net_bridge *br = netdev_priv(dev); + if (new_mtu < 68 || new_mtu > br_min_mtu(br)) + return -EINVAL; + + dev->mtu = new_mtu; + +#ifdef CONFIG_BRIDGE_NETFILTER + /* remember the MTU in the rtable for PMTU */ + br->fake_rtable.u.dst.metrics[RTAX_MTU - 1] = new_mtu; +#endif + + return 0; } static int br_set_sg(struct net_device *dev, u32 data) @@ -160,28 +316,113 @@ .get_flags = ethtool_op_get_flags, }; -static const struct net_device_ops br_netdev_ops = { +static struct net_device_ops br_netdev_ops = { .ndo_open = br_dev_open, .ndo_stop = br_dev_stop, + .ndo_init = br_dev_init, .ndo_start_xmit = br_dev_xmit, .ndo_set_mac_address = br_set_mac_address, - .ndo_set_multicast_list = br_dev_set_multicast_list, + .ndo_set_rx_mode = br_dev_set_multicast_list, .ndo_change_mtu = br_change_mtu, .ndo_do_ioctl = br_dev_ioctl, +#ifdef CONFIG_NET_POLL_CONTROLLER + .ndo_netpoll_setup = br_netpoll_setup, + .ndo_netpoll_cleanup = br_netpoll_cleanup, + .ndo_poll_controller = br_poll_controller, +#endif +#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 + **/ + .ndo_add_slave = br_add_slave, + .ndo_del_slave = br_del_slave, +#endif +#if 1 + /* AVM: not present in 2.6.32; added around 3.4, commits: + * + * 77162022ab26a1f99d3af30c03760a76f86e193d net: add generic PF_BRIDGE:RTM_ FDB hooks + **/ + .ndo_fdb_add = br_fdb_add, + .ndo_fdb_del = br_fdb_delete, + .ndo_fdb_dump = br_fdb_dump, +#endif +#if 0 + /* AVM: not present in 2.6.32; added around 3.7, commits: + * + * e5a55a898720096f43bc24938f8875c0a1b34cd7 net: create generic bridge ops + **/ + .ndo_bridge_getlink = br_getlink, + .ndo_bridge_setlink = br_setlink, + .ndo_bridge_dellink = br_dellink, +#endif +}; + +static void br_dev_free(struct net_device *dev) +{ + free_netdev(dev); +} + +static struct device_type br_type = { + .name = "bridge", }; void br_dev_setup(struct net_device *dev) { - random_ether_addr(dev->dev_addr); + struct net_bridge *br = netdev_priv(dev); + + eth_hw_addr_random(dev); ether_setup(dev); dev->netdev_ops = &br_netdev_ops; - dev->destructor = free_netdev; + dev->destructor = br_dev_free; SET_ETHTOOL_OPS(dev, &br_ethtool_ops); + SET_NETDEV_DEVTYPE(dev, &br_type); dev->tx_queue_len = 0; dev->priv_flags = IFF_EBRIDGE; + /* == AVM/RSP 20100915 == + * Reserve extra space for WLAN header to avoid + * skb copy. + */ + dev->hard_header_len = ETH_HLEN + 40; + + dev->features = COMMON_FEATURES | NETIF_F_LLTX | NETIF_F_NETNS_LOCAL | + NETIF_F_HW_VLAN_CTAG_TX; +#if 0 + /* AVM: not present in 2.6.32, added around 2.6.38, + * commit: + * + * 5455c6998d34dc983a8693500e4dffefc3682dc5 net: Introduce new feature setting ops + */ + dev->hw_features = COMMON_FEATURES | NETIF_F_HW_VLAN_CTAG_TX; +#endif + dev->vlan_features = COMMON_FEATURES; - dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA | - NETIF_F_GSO_MASK | NETIF_F_NO_CSUM | NETIF_F_LLTX | - NETIF_F_NETNS_LOCAL | NETIF_F_GSO; + 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; + + ether_addr_copy(br->group_addr, eth_reserved_addr_base); + + br->feature_mask = dev->features; + br->stp_enabled = BR_NO_STP; + br->group_fwd_mask = BR_GROUPFWD_DEFAULT; + + br->designated_root = br->bridge_id; + 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->ageing_time = 300 * HZ; + + br_netfilter_rtable_init(br); + br_stp_timer_init(br); + br_multicast_init(br); }