Patched in Tegra support.

1 files changed, 37 insertions, 41 deletions

diff --git a/net/bridge/br_device.c b/net/bridge/br_device.c
index 7c78e264019..dac6a214746 100644
--- a/net/bridge/br_device.c
+++ b/net/bridge/br_device.c
@@ -31,25 +31,25 @@ netdev_tx_t br_dev_xmit(struct sk_buff *skb, struct net_device *dev)
         struct net_bridge_mdb_entry *mdst;
         struct br_cpu_netstats *brstats = this_cpu_ptr(br->stats);
 
-        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
 
-        u64_stats_update_begin(&brstats->syncp);
-        brstats->tx_packets++;
-        brstats->tx_bytes += skb->len;
-        u64_stats_update_end(&brstats->syncp);
-
         BR_INPUT_SKB_CB(skb)->brdev = dev;
 
         skb_reset_mac_header(skb);
         skb_pull(skb, ETH_HLEN);
 
+        u64_stats_update_begin(&brstats->syncp);
+        brstats->tx_packets++;
+        /* Exclude ETH_HLEN from byte stats for consistency with Rx chain */
+        brstats->tx_bytes += skb->len;
+        u64_stats_update_end(&brstats->syncp);
+
+        rcu_read_lock();
         if (is_broadcast_ether_addr(dest))
                 br_flood_deliver(br, skb);
         else if (is_multicast_ether_addr(dest)) {
@@ -128,9 +128,9 @@ static struct rtnl_link_stats64 *br_get_stats64(struct net_device *dev,
                 const struct br_cpu_netstats *bstats
                         = per_cpu_ptr(br->stats, cpu);
                 do {
-                        start = u64_stats_fetch_begin_bh(&bstats->syncp);
+                        start = u64_stats_fetch_begin(&bstats->syncp);
                         memcpy(&tmp, bstats, sizeof(tmp));
-                } while (u64_stats_fetch_retry_bh(&bstats->syncp, start));
+                } while (u64_stats_fetch_retry(&bstats->syncp, start));
                 sum.tx_bytes   += tmp.tx_bytes;
                 sum.tx_packets += tmp.tx_packets;
                 sum.rx_bytes   += tmp.rx_bytes;
@@ -168,15 +168,11 @@ static int br_set_mac_address(struct net_device *dev, void *p)
         struct sockaddr *addr = p;
 
         if (!is_valid_ether_addr(addr->sa_data))
-                return -EADDRNOTAVAIL;
+                return -EINVAL;
 
         spin_lock_bh(&br->lock);
-        if (!ether_addr_equal(dev->dev_addr, addr->sa_data)) {
-                dev->addr_assign_type &= ~NET_ADDR_RANDOM;
-                memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
-                br_fdb_change_mac_address(br, addr->sa_data);
-                br_stp_change_bridge_id(br, addr->sa_data);
-        }
+        memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN);
+        br_stp_change_bridge_id(br, addr->sa_data);
         br->flags |= BR_SET_MAC_ADDR;
         spin_unlock_bh(&br->lock);
 
@@ -191,8 +187,7 @@ static void br_getinfo(struct net_device *dev, struct ethtool_drvinfo *info)
         strcpy(info->bus_info, "N/A");
 }
 
-static netdev_features_t br_fix_features(struct net_device *dev,
-        netdev_features_t features)
+static u32 br_fix_features(struct net_device *dev, u32 features)
 {
         struct net_bridge *br = netdev_priv(dev);
 
@@ -207,23 +202,24 @@ 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;
+        struct net_bridge_port *p, *n;
 
-        list_for_each_entry(p, &br->port_list, list)
+        list_for_each_entry_safe(p, n, &br->port_list, list) {
                 br_netpoll_disable(p);
+        }
 }
 
-static int br_netpoll_setup(struct net_device *dev, struct netpoll_info *ni,
-                            gfp_t gfp)
+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;
+        struct net_bridge_port *p, *n;
         int err = 0;
 
-        list_for_each_entry(p, &br->port_list, list) {
+        list_for_each_entry_safe(p, n, &br->port_list, list) {
                 if (!p->dev)
                         continue;
-                err = br_netpoll_enable(p, gfp);
+
+                err = br_netpoll_enable(p);
                 if (err)
                         goto fail;
         }
@@ -236,17 +232,20 @@ fail:
         goto out;
 }
 
-int br_netpoll_enable(struct net_bridge_port *p, gfp_t gfp)
+int br_netpoll_enable(struct net_bridge_port *p)
 {
         struct netpoll *np;
         int err = 0;
 
-        np = kzalloc(sizeof(*p->np), gfp);
+        np = kzalloc(sizeof(*p->np), GFP_KERNEL);
         err = -ENOMEM;
         if (!np)
                 goto out;
 
-        err = __netpoll_setup(np, p->dev, gfp);
+        np->dev = p->dev;
+        strlcpy(np->dev_name, p->dev->name, IFNAMSIZ);
+
+        err = __netpoll_setup(np);
         if (err) {
                 kfree(np);
                 goto out;
@@ -267,7 +266,11 @@ void br_netpoll_disable(struct net_bridge_port *p)
 
         p->np = NULL;
 
-        __netpoll_free_rcu(np);
+        /* Wait for transmitting packets to finish before freeing. */
+        synchronize_rcu_bh();
+
+        __netpoll_cleanup(np);
+        kfree(np);
 }
 
 #endif
@@ -299,7 +302,7 @@ static const struct net_device_ops br_netdev_ops = {
         .ndo_start_xmit          = br_dev_xmit,
         .ndo_get_stats64         = br_get_stats64,
         .ndo_set_mac_address     = br_set_mac_address,
-        .ndo_set_rx_mode         = br_dev_set_multicast_list,
+        .ndo_set_multicast_list  = br_dev_set_multicast_list,
         .ndo_change_mtu          = br_change_mtu,
         .ndo_do_ioctl            = br_dev_ioctl,
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -310,11 +313,6 @@ static const struct net_device_ops br_netdev_ops = {
         .ndo_add_slave           = br_add_slave,
         .ndo_del_slave           = br_del_slave,
         .ndo_fix_features        = br_fix_features,
-        .ndo_fdb_add             = br_fdb_add,
-        .ndo_fdb_del             = br_fdb_delete,
-        .ndo_fdb_dump            = br_fdb_dump,
-        .ndo_bridge_getlink      = br_getlink,
-        .ndo_bridge_setlink      = br_setlink,
 };
 
 static void br_dev_free(struct net_device *dev)
@@ -333,7 +331,7 @@ void br_dev_setup(struct net_device *dev)
 {
         struct net_bridge *br = netdev_priv(dev);
 
-        eth_hw_addr_random(dev);
+        random_ether_addr(dev->dev_addr);
         ether_setup(dev);
 
         dev->netdev_ops = &br_netdev_ops;
@@ -344,10 +342,10 @@ void br_dev_setup(struct net_device *dev)
         dev->priv_flags = IFF_EBRIDGE;
 
         dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
-                        NETIF_F_GSO_MASK | NETIF_F_HW_CSUM | NETIF_F_LLTX |
+                        NETIF_F_GSO_MASK | NETIF_F_NO_CSUM | NETIF_F_LLTX |
                         NETIF_F_NETNS_LOCAL | NETIF_F_HW_VLAN_TX;
         dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_HIGHDMA |
-                           NETIF_F_GSO_MASK | NETIF_F_HW_CSUM |
+                           NETIF_F_GSO_MASK | NETIF_F_NO_CSUM |
                            NETIF_F_HW_VLAN_TX;
 
         br->dev = dev;
@@ -358,11 +356,9 @@ void br_dev_setup(struct net_device *dev)
         br->bridge_id.prio[0] = 0x80;
         br->bridge_id.prio[1] = 0x00;
 
-        memcpy(br->group_addr, eth_reserved_addr_base, ETH_ALEN);
+        memcpy(br->group_addr, br_group_address, ETH_ALEN);
 
         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;