Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking changes from David Miller:

1) Allow to dump, monitor, and change the bridge multicast database
   using netlink.  From Cong Wang.

2) RFC 5961 TCP blind data injection attack mitigation, from Eric
   Dumazet.

3) Networking user namespace support from Eric W. Biederman.

4) tuntap/virtio-net multiqueue support by Jason Wang.

5) Support for checksum offload of encapsulated packets (basically,
   tunneled traffic can still be checksummed by HW).  From Joseph
   Gasparakis.

6) Allow BPF filter access to VLAN tags, from Eric Dumazet and
   Daniel Borkmann.

7) Bridge port parameters over netlink and BPDU blocking support
   from Stephen Hemminger.

8) Improve data access patterns during inet socket demux by rearranging
   socket layout, from Eric Dumazet.

9) TIPC protocol updates and cleanups from Ying Xue, Paul Gortmaker, and
   Jon Maloy.

10) Update TCP socket hash sizing to be more in line with current day
    realities.  The existing heurstics were choosen a decade ago.
    From Eric Dumazet.

11) Fix races, queue bloat, and excessive wakeups in ATM and
    associated drivers, from Krzysztof Mazur and David Woodhouse.

12) Support DOVE (Distributed Overlay Virtual Ethernet) extensions
    in VXLAN driver, from David Stevens.

13) Add "oops_only" mode to netconsole, from Amerigo Wang.

14) Support set and query of VEB/VEPA bridge mode via PF_BRIDGE, also
    allow DCB netlink to work on namespaces other than the initial
    namespace.  From John Fastabend.

15) Support PTP in the Tigon3 driver, from Matt Carlson.

16) tun/vhost zero copy fixes and improvements, plus turn it on
    by default, from Michael S. Tsirkin.

17) Support per-association statistics in SCTP, from Michele
    Baldessari.

And many, many, driver updates, cleanups, and improvements.  Too
numerous to mention individually.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1722 commits)
  net/mlx4_en: Add support for destination MAC in steering rules
  net/mlx4_en: Use generic etherdevice.h functions.
  net: ethtool: Add destination MAC address to flow steering API
  bridge: add support of adding and deleting mdb entries
  bridge: notify mdb changes via netlink
  ndisc: Unexport ndisc_{build,send}_skb().
  uapi: add missing netconf.h to export list
  pkt_sched: avoid requeues if possible
  solos-pci: fix double-free of TX skb in DMA mode
  bnx2: Fix accidental reversions.
  bna: Driver Version Updated to 3.1.2.1
  bna: Firmware update
  bna: Add RX State
  bna: Rx Page Based Allocation
  bna: TX Intr Coalescing Fix
  bna: Tx and Rx Optimizations
  bna: Code Cleanup and Enhancements
  ath9k: check pdata variable before dereferencing it
  ath5k: RX timestamp is reported at end of frame
  ath9k_htc: RX timestamp is reported at end of frame
  ...

2 files changed, 64 insertions, 16 deletions

diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index ffdf712f9a67..1ea6f1dbbedd 100644
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -4,13 +4,9 @@
 
 menu "PTP clock support"
 
-comment "Enable Device Drivers -> PPS to see the PTP clock options."
-        depends on PPS=n
-
 config PTP_1588_CLOCK
         tristate "PTP clock support"
-        depends on EXPERIMENTAL
-        depends on PPS
+        select PPS
         help
           The IEEE 1588 standard defines a method to precisely
           synchronize distributed clocks over Ethernet networks. The
@@ -29,8 +25,9 @@ config PTP_1588_CLOCK
 
 config PTP_1588_CLOCK_GIANFAR
         tristate "Freescale eTSEC as PTP clock"
-        depends on PTP_1588_CLOCK
         depends on GIANFAR
+        select PTP_1588_CLOCK
+        default y
         help
           This driver adds support for using the eTSEC as a PTP
           clock. This clock is only useful if your PTP programs are
@@ -42,8 +39,9 @@ config PTP_1588_CLOCK_GIANFAR
 
 config PTP_1588_CLOCK_IXP46X
         tristate "Intel IXP46x as PTP clock"
-        depends on PTP_1588_CLOCK
         depends on IXP4XX_ETH
+        select PTP_1588_CLOCK
+        default y
         help
           This driver adds support for using the IXP46X as a PTP
           clock. This clock is only useful if your PTP programs are
@@ -54,13 +52,13 @@ config PTP_1588_CLOCK_IXP46X
           will be called ptp_ixp46x.
 
 comment "Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks."
-        depends on PTP_1588_CLOCK && (PHYLIB=n || NETWORK_PHY_TIMESTAMPING=n)
+        depends on PHYLIB=n || NETWORK_PHY_TIMESTAMPING=n
 
 config DP83640_PHY
         tristate "Driver for the National Semiconductor DP83640 PHYTER"
-        depends on PTP_1588_CLOCK
         depends on NETWORK_PHY_TIMESTAMPING
         depends on PHYLIB
+        select PTP_1588_CLOCK
         ---help---
           Supports the DP83640 PHYTER with IEEE 1588 features.
 
@@ -74,8 +72,7 @@ config DP83640_PHY
 
 config PTP_1588_CLOCK_PCH
         tristate "Intel PCH EG20T as PTP clock"
-        depends on PTP_1588_CLOCK
-        depends on PCH_GBE
+        select PTP_1588_CLOCK
         help
           This driver adds support for using the PCH EG20T as a PTP
           clock. The hardware supports time stamping of PTP packets
diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c
index e7f301da2902..34a0c607318e 100644
--- a/drivers/ptp/ptp_chardev.c
+++ b/drivers/ptp/ptp_chardev.c
@@ -21,6 +21,7 @@
 #include <linux/posix-clock.h>
 #include <linux/poll.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 
 #include "ptp_private.h"
 
@@ -33,9 +34,13 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
 {
         struct ptp_clock_caps caps;
         struct ptp_clock_request req;
+        struct ptp_sys_offset *sysoff = NULL;
         struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
         struct ptp_clock_info *ops = ptp->info;
+        struct ptp_clock_time *pct;
+        struct timespec ts;
         int enable, err = 0;
+        unsigned int i;
 
         switch (cmd) {
 
@@ -88,10 +93,45 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg)
                 err = ops->enable(ops, &req, enable);
                 break;
 
+        case PTP_SYS_OFFSET:
+                sysoff = kmalloc(sizeof(*sysoff), GFP_KERNEL);
+                if (!sysoff) {
+                        err = -ENOMEM;
+                        break;
+                }
+                if (copy_from_user(sysoff, (void __user *)arg,
+                                   sizeof(*sysoff))) {
+                        err = -EFAULT;
+                        break;
+                }
+                if (sysoff->n_samples > PTP_MAX_SAMPLES) {
+                        err = -EINVAL;
+                        break;
+                }
+                pct = &sysoff->ts[0];
+                for (i = 0; i < sysoff->n_samples; i++) {
+                        getnstimeofday(&ts);
+                        pct->sec = ts.tv_sec;
+                        pct->nsec = ts.tv_nsec;
+                        pct++;
+                        ptp->info->gettime(ptp->info, &ts);
+                        pct->sec = ts.tv_sec;
+                        pct->nsec = ts.tv_nsec;
+                        pct++;
+                }
+                getnstimeofday(&ts);
+                pct->sec = ts.tv_sec;
+                pct->nsec = ts.tv_nsec;
+                if (copy_to_user((void __user *)arg, sysoff, sizeof(*sysoff)))
+                        err = -EFAULT;
+                break;
+
         default:
                 err = -ENOTTY;
                 break;
         }
+
+        kfree(sysoff);
         return err;
 }
 
@@ -104,20 +144,23 @@ unsigned int ptp_poll(struct posix_clock *pc, struct file *fp, poll_table *wait)
         return queue_cnt(&ptp->tsevq) ? POLLIN : 0;
 }
 
+#define EXTTS_BUFSIZE (PTP_BUF_TIMESTAMPS * sizeof(struct ptp_extts_event))
+
 ssize_t ptp_read(struct posix_clock *pc,
                  uint rdflags, char __user *buf, size_t cnt)
 {
         struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
         struct timestamp_event_queue *queue = &ptp->tsevq;
-        struct ptp_extts_event event[PTP_BUF_TIMESTAMPS];
+        struct ptp_extts_event *event;
         unsigned long flags;
         size_t qcnt, i;
+        int result;
 
         if (cnt % sizeof(struct ptp_extts_event) != 0)
                 return -EINVAL;
 
-        if (cnt > sizeof(event))
-                cnt = sizeof(event);
+        if (cnt > EXTTS_BUFSIZE)
+                cnt = EXTTS_BUFSIZE;
 
         cnt = cnt / sizeof(struct ptp_extts_event);
 
@@ -135,6 +178,12 @@ ssize_t ptp_read(struct posix_clock *pc,
                 return -ENODEV;
         }
 
+        event = kmalloc(EXTTS_BUFSIZE, GFP_KERNEL);
+        if (!event) {
+                mutex_unlock(&ptp->tsevq_mux);
+                return -ENOMEM;
+        }
+
         spin_lock_irqsave(&queue->lock, flags);
 
         qcnt = queue_cnt(queue);
@@ -153,8 +202,10 @@ ssize_t ptp_read(struct posix_clock *pc,
 
         mutex_unlock(&ptp->tsevq_mux);
 
+        result = cnt;
         if (copy_to_user(buf, event, cnt))
-                return -EFAULT;
+                result = -EFAULT;
 
-        return cnt;
+        kfree(event);
+        return result;
 }