Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-commands.h

5 files changed, 155 insertions, 81 deletions

diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
index 3c1c8c14e929..a2ad15250575 100644
--- a/net/8021q/vlan.c
+++ b/net/8021q/vlan.c
@@ -155,9 +155,10 @@ void unregister_vlan_dev(struct net_device *dev, struct list_head *head)
         BUG_ON(!grp);
 
         /* Take it out of our own structures, but be sure to interlock with
-         * HW accelerating devices or SW vlan input packet processing.
+         * HW accelerating devices or SW vlan input packet processing if
+         * VLAN is not 0 (leave it there for 802.1p).
          */
-        if (real_dev->features & NETIF_F_HW_VLAN_FILTER)
+        if (vlan_id && (real_dev->features & NETIF_F_HW_VLAN_FILTER))
                 ops->ndo_vlan_rx_kill_vid(real_dev, vlan_id);
 
         grp->nr_vlans--;
@@ -419,6 +420,14 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
         if (is_vlan_dev(dev))
                 __vlan_device_event(dev, event);
 
+        if ((event == NETDEV_UP) &&
+            (dev->features & NETIF_F_HW_VLAN_FILTER) &&
+            dev->netdev_ops->ndo_vlan_rx_add_vid) {
+                pr_info("8021q: adding VLAN 0 to HW filter on device %s\n",
+                        dev->name);
+                dev->netdev_ops->ndo_vlan_rx_add_vid(dev, 0);
+        }
+
         grp = __vlan_find_group(dev);
         if (!grp)
                 goto out;
diff --git a/net/8021q/vlan.h b/net/8021q/vlan.h
index 6abdcac1b2e8..8d9503ad01da 100644
--- a/net/8021q/vlan.h
+++ b/net/8021q/vlan.h
@@ -2,6 +2,7 @@
 #define __BEN_VLAN_802_1Q_INC__
 
 #include <linux/if_vlan.h>
+#include <linux/u64_stats_sync.h>
 
 
 /**
@@ -21,14 +22,16 @@ struct vlan_priority_tci_mapping {
  *      struct vlan_rx_stats - VLAN percpu rx stats
  *      @rx_packets: number of received packets
  *      @rx_bytes: number of received bytes
- *      @multicast: number of received multicast packets
+ *      @rx_multicast: number of received multicast packets
+ *      @syncp: synchronization point for 64bit counters
  *      @rx_errors: number of errors
  */
 struct vlan_rx_stats {
-        unsigned long rx_packets;
-        unsigned long rx_bytes;
-        unsigned long multicast;
-        unsigned long rx_errors;
+        u64                     rx_packets;
+        u64                     rx_bytes;
+        u64                     rx_multicast;
+        struct u64_stats_sync   syncp;
+        unsigned long           rx_errors;
 };
 
 /**
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
index bd537fc10254..01ddb0472f86 100644
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
@@ -8,17 +8,23 @@
 int __vlan_hwaccel_rx(struct sk_buff *skb, struct vlan_group *grp,
                       u16 vlan_tci, int polling)
 {
+        struct net_device *vlan_dev;
+        u16 vlan_id;
+
         if (netpoll_rx(skb))
                 return NET_RX_DROP;
 
         if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-                goto drop;
+                skb->deliver_no_wcard = 1;
 
         skb->skb_iif = skb->dev->ifindex;
         __vlan_hwaccel_put_tag(skb, vlan_tci);
-        skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
+        vlan_id = vlan_tci & VLAN_VID_MASK;
+        vlan_dev = vlan_group_get_device(grp, vlan_id);
 
-        if (!skb->dev)
+        if (vlan_dev)
+                skb->dev = vlan_dev;
+        else if (vlan_id)
                 goto drop;
 
         return (polling ? netif_receive_skb(skb) : netif_rx(skb));
@@ -41,9 +47,9 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
         skb->priority = vlan_get_ingress_priority(dev, skb->vlan_tci);
         skb->vlan_tci = 0;
 
-        rx_stats = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats,
-                               smp_processor_id());
+        rx_stats = this_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats);
 
+        u64_stats_update_begin(&rx_stats->syncp);
         rx_stats->rx_packets++;
         rx_stats->rx_bytes += skb->len;
 
@@ -51,7 +57,7 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
         case PACKET_BROADCAST:
                 break;
         case PACKET_MULTICAST:
-                rx_stats->multicast++;
+                rx_stats->rx_multicast++;
                 break;
         case PACKET_OTHERHOST:
                 /* Our lower layer thinks this is not local, let's make sure.
@@ -62,6 +68,7 @@ int vlan_hwaccel_do_receive(struct sk_buff *skb)
                         skb->pkt_type = PACKET_HOST;
                 break;
         }
+        u64_stats_update_end(&rx_stats->syncp);
         return 0;
 }
 
@@ -82,15 +89,20 @@ vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
                 unsigned int vlan_tci, struct sk_buff *skb)
 {
         struct sk_buff *p;
+        struct net_device *vlan_dev;
+        u16 vlan_id;
 
         if (skb_bond_should_drop(skb, ACCESS_ONCE(skb->dev->master)))
-                goto drop;
+                skb->deliver_no_wcard = 1;
 
         skb->skb_iif = skb->dev->ifindex;
         __vlan_hwaccel_put_tag(skb, vlan_tci);
-        skb->dev = vlan_group_get_device(grp, vlan_tci & VLAN_VID_MASK);
+        vlan_id = vlan_tci & VLAN_VID_MASK;
+        vlan_dev = vlan_group_get_device(grp, vlan_id);
 
-        if (!skb->dev)
+        if (vlan_dev)
+                skb->dev = vlan_dev;
+        else if (vlan_id)
                 goto drop;
 
         for (p = napi->gro_list; p; p = p->next) {
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 55be90826f5f..3d59c9bf8feb 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -142,6 +142,7 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
 {
         struct vlan_hdr *vhdr;
         struct vlan_rx_stats *rx_stats;
+        struct net_device *vlan_dev;
         u16 vlan_id;
         u16 vlan_tci;
 
@@ -157,53 +158,71 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
         vlan_id = vlan_tci & VLAN_VID_MASK;
 
         rcu_read_lock();
-        skb->dev = __find_vlan_dev(dev, vlan_id);
-        if (!skb->dev) {
-                pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",
-                         __func__, vlan_id, dev->name);
-                goto err_unlock;
-        }
-
-        rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
-                               smp_processor_id());
-        rx_stats->rx_packets++;
-        rx_stats->rx_bytes += skb->len;
-
-        skb_pull_rcsum(skb, VLAN_HLEN);
-
-        skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
-
-        pr_debug("%s: priority: %u for TCI: %hu\n",
-                 __func__, skb->priority, vlan_tci);
-
-        switch (skb->pkt_type) {
-        case PACKET_BROADCAST: /* Yeah, stats collect these together.. */
-                /* stats->broadcast ++; // no such counter :-( */
-                break;
+        vlan_dev = __find_vlan_dev(dev, vlan_id);
 
-        case PACKET_MULTICAST:
-                rx_stats->multicast++;
-                break;
+        /* If the VLAN device is defined, we use it.
+         * If not, and the VID is 0, it is a 802.1p packet (not
+         * really a VLAN), so we will just netif_rx it later to the
+         * original interface, but with the skb->proto set to the
+         * wrapped proto: we do nothing here.
+         */
 
-        case PACKET_OTHERHOST:
-                /* Our lower layer thinks this is not local, let's make sure.
-                 * This allows the VLAN to have a different MAC than the
-                 * underlying device, and still route correctly.
-                 */
-                if (!compare_ether_addr(eth_hdr(skb)->h_dest,
-                                        skb->dev->dev_addr))
-                        skb->pkt_type = PACKET_HOST;
-                break;
-        default:
-                break;
+        if (!vlan_dev) {
+                if (vlan_id) {
+                        pr_debug("%s: ERROR: No net_device for VID: %u on dev: %s\n",
+                                 __func__, vlan_id, dev->name);
+                        goto err_unlock;
+                }
+                rx_stats = NULL;
+        } else {
+                skb->dev = vlan_dev;
+
+                rx_stats = per_cpu_ptr(vlan_dev_info(skb->dev)->vlan_rx_stats,
+                                        smp_processor_id());
+                u64_stats_update_begin(&rx_stats->syncp);
+                rx_stats->rx_packets++;
+                rx_stats->rx_bytes += skb->len;
+
+                skb->priority = vlan_get_ingress_priority(skb->dev, vlan_tci);
+
+                pr_debug("%s: priority: %u for TCI: %hu\n",
+                         __func__, skb->priority, vlan_tci);
+
+                switch (skb->pkt_type) {
+                case PACKET_BROADCAST:
+                        /* Yeah, stats collect these together.. */
+                        /* stats->broadcast ++; // no such counter :-( */
+                        break;
+
+                case PACKET_MULTICAST:
+                        rx_stats->rx_multicast++;
+                        break;
+
+                case PACKET_OTHERHOST:
+                        /* Our lower layer thinks this is not local, let's make
+                         * sure.
+                         * This allows the VLAN to have a different MAC than the
+                         * underlying device, and still route correctly.
+                         */
+                        if (!compare_ether_addr(eth_hdr(skb)->h_dest,
+                                                skb->dev->dev_addr))
+                                skb->pkt_type = PACKET_HOST;
+                        break;
+                default:
+                        break;
+                }
+                u64_stats_update_end(&rx_stats->syncp);
         }
 
+        skb_pull_rcsum(skb, VLAN_HLEN);
         vlan_set_encap_proto(skb, vhdr);
 
-        skb = vlan_check_reorder_header(skb);
-        if (!skb) {
-                rx_stats->rx_errors++;
-                goto err_unlock;
+        if (vlan_dev) {
+                skb = vlan_check_reorder_header(skb);
+                if (!skb) {
+                        rx_stats->rx_errors++;
+                        goto err_unlock;
+                }
         }
 
         netif_rx(skb);
@@ -708,7 +727,8 @@ static int vlan_dev_init(struct net_device *dev)
         netif_carrier_off(dev);
 
         /* IFF_BROADCAST|IFF_MULTICAST; ??? */
-        dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI);
+        dev->flags  = real_dev->flags & ~(IFF_UP | IFF_PROMISC | IFF_ALLMULTI |
+                                          IFF_MASTER | IFF_SLAVE);
         dev->iflink = real_dev->ifindex;
         dev->state  = (real_dev->state & ((1<<__LINK_STATE_NOCARRIER) |
                                           (1<<__LINK_STATE_DORMANT))) |
@@ -800,37 +820,65 @@ static u32 vlan_ethtool_get_flags(struct net_device *dev)
         return dev_ethtool_get_flags(vlan->real_dev);
 }
 
-static struct net_device_stats *vlan_dev_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats)
 {
-        struct net_device_stats *stats = &dev->stats;
-
         dev_txq_stats_fold(dev, stats);
 
         if (vlan_dev_info(dev)->vlan_rx_stats) {
-                struct vlan_rx_stats *p, rx = {0};
+                struct vlan_rx_stats *p, accum = {0};
                 int i;
 
                 for_each_possible_cpu(i) {
+                        u64 rxpackets, rxbytes, rxmulticast;
+                        unsigned int start;
+
                         p = per_cpu_ptr(vlan_dev_info(dev)->vlan_rx_stats, i);
-                        rx.rx_packets += p->rx_packets;
-                        rx.rx_bytes   += p->rx_bytes;
-                        rx.rx_errors  += p->rx_errors;
-                        rx.multicast  += p->multicast;
+                        do {
+                                start = u64_stats_fetch_begin_bh(&p->syncp);
+                                rxpackets       = p->rx_packets;
+                                rxbytes         = p->rx_bytes;
+                                rxmulticast     = p->rx_multicast;
+                        } while (u64_stats_fetch_retry_bh(&p->syncp, start));
+                        accum.rx_packets += rxpackets;
+                        accum.rx_bytes   += rxbytes;
+                        accum.rx_multicast += rxmulticast;
+                        /* rx_errors is an ulong, not protected by syncp */
+                        accum.rx_errors  += p->rx_errors;
                 }
-                stats->rx_packets = rx.rx_packets;
-                stats->rx_bytes   = rx.rx_bytes;
-                stats->rx_errors  = rx.rx_errors;
-                stats->multicast  = rx.multicast;
+                stats->rx_packets = accum.rx_packets;
+                stats->rx_bytes   = accum.rx_bytes;
+                stats->rx_errors  = accum.rx_errors;
+                stats->multicast  = accum.rx_multicast;
         }
         return stats;
 }
 
+static int vlan_ethtool_set_tso(struct net_device *dev, u32 data)
+{
+       if (data) {
+                struct net_device *real_dev = vlan_dev_info(dev)->real_dev;
+
+                /* Underlying device must support TSO for VLAN-tagged packets
+                 * and must have TSO enabled now.
+                 */
+                if (!(real_dev->vlan_features & NETIF_F_TSO))
+                        return -EOPNOTSUPP;
+                if (!(real_dev->features & NETIF_F_TSO))
+                        return -EINVAL;
+                dev->features |= NETIF_F_TSO;
+        } else {
+                dev->features &= ~NETIF_F_TSO;
+        }
+        return 0;
+}
+
 static const struct ethtool_ops vlan_ethtool_ops = {
         .get_settings           = vlan_ethtool_get_settings,
         .get_drvinfo            = vlan_ethtool_get_drvinfo,
         .get_link               = ethtool_op_get_link,
         .get_rx_csum            = vlan_ethtool_get_rx_csum,
         .get_flags              = vlan_ethtool_get_flags,
+        .set_tso                = vlan_ethtool_set_tso,
 };
 
 static const struct net_device_ops vlan_netdev_ops = {
@@ -847,7 +895,7 @@ static const struct net_device_ops vlan_netdev_ops = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
-        .ndo_get_stats          = vlan_dev_get_stats,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
@@ -871,7 +919,7 @@ static const struct net_device_ops vlan_netdev_accel_ops = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
-        .ndo_get_stats          = vlan_dev_get_stats,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
@@ -896,7 +944,7 @@ static const struct net_device_ops vlan_netdev_ops_sq = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
-        .ndo_get_stats          = vlan_dev_get_stats,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
@@ -921,7 +969,7 @@ static const struct net_device_ops vlan_netdev_accel_ops_sq = {
         .ndo_change_rx_flags    = vlan_dev_change_rx_flags,
         .ndo_do_ioctl           = vlan_dev_ioctl,
         .ndo_neigh_setup        = vlan_dev_neigh_setup,
-        .ndo_get_stats          = vlan_dev_get_stats,
+        .ndo_get_stats64        = vlan_dev_get_stats64,
 #if defined(CONFIG_FCOE) || defined(CONFIG_FCOE_MODULE)
         .ndo_fcoe_ddp_setup     = vlan_dev_fcoe_ddp_setup,
         .ndo_fcoe_ddp_done      = vlan_dev_fcoe_ddp_done,
diff --git a/net/8021q/vlanproc.c b/net/8021q/vlanproc.c
index afead353e215..80e280f56686 100644
--- a/net/8021q/vlanproc.c
+++ b/net/8021q/vlanproc.c
@@ -278,25 +278,27 @@ static int vlandev_seq_show(struct seq_file *seq, void *offset)
 {
         struct net_device *vlandev = (struct net_device *) seq->private;
         const struct vlan_dev_info *dev_info = vlan_dev_info(vlandev);
-        const struct net_device_stats *stats;
+        struct rtnl_link_stats64 temp;
+        const struct rtnl_link_stats64 *stats;
         static const char fmt[] = "%30s %12lu\n";
+        static const char fmt64[] = "%30s %12llu\n";
         int i;
 
         if (!is_vlan_dev(vlandev))
                 return 0;
 
-        stats = dev_get_stats(vlandev);
+        stats = dev_get_stats(vlandev, &temp);
         seq_printf(seq,
                    "%s  VID: %d  REORDER_HDR: %i  dev->priv_flags: %hx\n",
                    vlandev->name, dev_info->vlan_id,
                    (int)(dev_info->flags & 1), vlandev->priv_flags);
 
-        seq_printf(seq, fmt, "total frames received", stats->rx_packets);
-        seq_printf(seq, fmt, "total bytes received", stats->rx_bytes);
-        seq_printf(seq, fmt, "Broadcast/Multicast Rcvd", stats->multicast);
+        seq_printf(seq, fmt64, "total frames received", stats->rx_packets);
+        seq_printf(seq, fmt64, "total bytes received", stats->rx_bytes);
+        seq_printf(seq, fmt64, "Broadcast/Multicast Rcvd", stats->multicast);
         seq_puts(seq, "\n");
-        seq_printf(seq, fmt, "total frames transmitted", stats->tx_packets);
-        seq_printf(seq, fmt, "total bytes transmitted", stats->tx_bytes);
+        seq_printf(seq, fmt64, "total frames transmitted", stats->tx_packets);
+        seq_printf(seq, fmt64, "total bytes transmitted", stats->tx_bytes);
         seq_printf(seq, fmt, "total headroom inc",
                    dev_info->cnt_inc_headroom_on_tx);
         seq_printf(seq, fmt, "total encap on xmit",