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

Pull networking updates from David Miller:
 "Highlights:

   1) Support more Realtek wireless chips, from Jes Sorenson.

   2) New BPF types for per-cpu hash and arrap maps, from Alexei
      Starovoitov.

   3) Make several TCP sysctls per-namespace, from Nikolay Borisov.

   4) Allow the use of SO_REUSEPORT in order to do per-thread processing
   of incoming TCP/UDP connections.  The muxing can be done using a
   BPF program which hashes the incoming packet.  From Craig Gallek.

   5) Add a multiplexer for TCP streams, to provide a messaged based
      interface.  BPF programs can be used to determine the message
      boundaries.  From Tom Herbert.

   6) Add 802.1AE MACSEC support, from Sabrina Dubroca.

   7) Avoid factorial complexity when taking down an inetdev interface
      with lots of configured addresses.  We were doing things like
      traversing the entire address less for each address removed, and
      flushing the entire netfilter conntrack table for every address as
      well.

   8) Add and use SKB bulk free infrastructure, from Jesper Brouer.

   9) Allow offloading u32 classifiers to hardware, and implement for
      ixgbe, from John Fastabend.

  10) Allow configuring IRQ coalescing parameters on a per-queue basis,
      from Kan Liang.

  11) Extend ethtool so that larger link mode masks can be supported.
      From David Decotigny.

  12) Introduce devlink, which can be used to configure port link types
      (ethernet vs Infiniband, etc.), port splitting, and switch device
      level attributes as a whole.  From Jiri Pirko.

  13) Hardware offload support for flower classifiers, from Amir Vadai.

  14) Add "Local Checksum Offload".  Basically, for a tunneled packet
      the checksum of the outer header is 'constant' (because with the
      checksum field filled into the inner protocol header, the payload
      of the outer frame checksums to 'zero'), and we can take advantage
      of that in various ways.  From Edward Cree"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1548 commits)
  bonding: fix bond_get_stats()
  net: bcmgenet: fix dma api length mismatch
  net/mlx4_core: Fix backward compatibility on VFs
  phy: mdio-thunder: Fix some Kconfig typos
  lan78xx: add ndo_get_stats64
  lan78xx: handle statistics counter rollover
  RDS: TCP: Remove unused constant
  RDS: TCP: Add sysctl tunables for sndbuf/rcvbuf on rds-tcp socket
  net: smc911x: convert pxa dma to dmaengine
  team: remove duplicate set of flag IFF_MULTICAST
  bonding: remove duplicate set of flag IFF_MULTICAST
  net: fix a comment typo
  ethernet: micrel: fix some error codes
  ip_tunnels, bpf: define IP_TUNNEL_OPTS_MAX and use it
  bpf, dst: add and use dst_tclassid helper
  bpf: make skb->tc_classid also readable
  net: mvneta: bm: clarify dependencies
  cls_bpf: reset class and reuse major in da
  ldmvsw: Checkpatch sunvnet.c and sunvnet_common.c
  ldmvsw: Add ldmvsw.c driver code
  ...

4 files changed, 29 insertions, 48 deletions

diff --git a/drivers/isdn/hardware/eicon/debug.c b/drivers/isdn/hardware/eicon/debug.c
index b5226af6ddec..576b7b4a3278 100644
--- a/drivers/isdn/hardware/eicon/debug.c
+++ b/drivers/isdn/hardware/eicon/debug.c
@@ -192,8 +192,6 @@ static diva_os_spin_lock_t dbg_q_lock;
 static diva_os_spin_lock_t dbg_adapter_lock;
 static int                 dbg_q_busy;
 static volatile dword      dbg_sequence;
-static dword               start_sec;
-static dword               start_usec;
 
 /*
   INTERFACE:
@@ -215,8 +213,6 @@ int diva_maint_init(byte *base, unsigned long length, int do_init) {
 
         dbg_base = base;
 
-        diva_os_get_time(&start_sec, &start_usec);
-
         *(dword *)base  = (dword)DBG_MAGIC; /* Store Magic */
         base   += sizeof(dword);
         length -= sizeof(dword);
diff --git a/drivers/isdn/hardware/eicon/divamnt.c b/drivers/isdn/hardware/eicon/divamnt.c
index 48db08d0bb3d..0de29b7b712f 100644
--- a/drivers/isdn/hardware/eicon/divamnt.c
+++ b/drivers/isdn/hardware/eicon/divamnt.c
@@ -45,7 +45,6 @@ char *DRIVERRELEASE_MNT = "2.0";
 
 static wait_queue_head_t msgwaitq;
 static unsigned long opened;
-static struct timeval start_time;
 
 extern int mntfunc_init(int *, void **, unsigned long);
 extern void mntfunc_finit(void);
@@ -88,28 +87,12 @@ int diva_os_copy_from_user(void *os_handle, void *dst, const void __user *src,
  */
 void diva_os_get_time(dword *sec, dword *usec)
 {
-        struct timeval tv;
-
-        do_gettimeofday(&tv);
-
-        if (tv.tv_sec > start_time.tv_sec) {
-                if (start_time.tv_usec > tv.tv_usec) {
-                        tv.tv_sec--;
-                        tv.tv_usec += 1000000;
-                }
-                *sec = (dword) (tv.tv_sec - start_time.tv_sec);
-                *usec = (dword) (tv.tv_usec - start_time.tv_usec);
-        } else if (tv.tv_sec == start_time.tv_sec) {
-                *sec = 0;
-                if (start_time.tv_usec < tv.tv_usec) {
-                        *usec = (dword) (tv.tv_usec - start_time.tv_usec);
-                } else {
-                        *usec = 0;
-                }
-        } else {
-                *sec = (dword) tv.tv_sec;
-                *usec = (dword) tv.tv_usec;
-        }
+        struct timespec64 time;
+
+        ktime_get_ts64(&time);
+
+        *sec = (dword) time.tv_sec;
+        *usec = (dword) (time.tv_nsec / NSEC_PER_USEC);
 }
 
 /*
@@ -213,7 +196,6 @@ static int __init maint_init(void)
         int ret = 0;
         void *buffer = NULL;
 
-        do_gettimeofday(&start_time);
         init_waitqueue_head(&msgwaitq);
 
         printk(KERN_INFO "%s\n", DRIVERNAME);
diff --git a/drivers/isdn/hardware/mISDN/ipac.h b/drivers/isdn/hardware/mISDN/ipac.h
index 8121e046b739..720ee72aab6a 100644
--- a/drivers/isdn/hardware/mISDN/ipac.h
+++ b/drivers/isdn/hardware/mISDN/ipac.h
@@ -99,32 +99,32 @@ struct ipac_hw {
 
 /* All registers original Siemens Spec  */
 /* IPAC/ISAC registers */
-#define ISAC_MASK               0x20
 #define ISAC_ISTA               0x20
-#define ISAC_STAR               0x21
+#define ISAC_MASK               0x20
 #define ISAC_CMDR               0x21
+#define ISAC_STAR               0x21
+#define ISAC_MODE               0x22
+#define ISAC_TIMR               0x23
 #define ISAC_EXIR               0x24
-#define ISAC_ADF2               0x39
+#define ISAC_RBCL               0x25
+#define ISAC_RSTA               0x27
+#define ISAC_RBCH               0x2A
 #define ISAC_SPCR               0x30
-#define ISAC_ADF1               0x38
 #define ISAC_CIR0               0x31
 #define ISAC_CIX0               0x31
-#define ISAC_CIR1               0x33
-#define ISAC_CIX1               0x33
-#define ISAC_STCR               0x37
-#define ISAC_MODE               0x22
-#define ISAC_RSTA               0x27
-#define ISAC_RBCL               0x25
-#define ISAC_RBCH               0x2A
-#define ISAC_TIMR               0x23
-#define ISAC_SQXR               0x3b
-#define ISAC_SQRR               0x3b
-#define ISAC_MOSR               0x3a
-#define ISAC_MOCR               0x3a
 #define ISAC_MOR0               0x32
 #define ISAC_MOX0               0x32
+#define ISAC_CIR1               0x33
+#define ISAC_CIX1               0x33
 #define ISAC_MOR1               0x34
 #define ISAC_MOX1               0x34
+#define ISAC_STCR               0x37
+#define ISAC_ADF1               0x38
+#define ISAC_ADF2               0x39
+#define ISAC_MOCR               0x3a
+#define ISAC_MOSR               0x3a
+#define ISAC_SQRR               0x3b
+#define ISAC_SQXR               0x3b
 
 #define ISAC_RBCH_XAC           0x80
 
@@ -212,13 +212,14 @@ struct ipac_hw {
 #define ISAC_CMD_DUI            0xF
 
 /* ISAC/ISACX/IPAC/IPACX L1 indications */
-#define ISAC_IND_RS             0x1
-#define ISAC_IND_PU             0x7
 #define ISAC_IND_DR             0x0
+#define ISAC_IND_RS             0x1
 #define ISAC_IND_SD             0x2
 #define ISAC_IND_DIS            0x3
-#define ISAC_IND_EI             0x6
 #define ISAC_IND_RSY            0x4
+#define ISAC_IND_DR6            0x5
+#define ISAC_IND_EI             0x6
+#define ISAC_IND_PU             0x7
 #define ISAC_IND_ARD            0x8
 #define ISAC_IND_TI             0xA
 #define ISAC_IND_ATI            0xB
@@ -339,9 +340,9 @@ struct ipac_hw {
 #define ISACX__AUX              0x08
 #define ISACX__CIC              0x10
 #define ISACX__ST               0x20
+#define IPACX__ON               0x2C
 #define IPACX__ICB              0x40
 #define IPACX__ICA              0x80
-#define IPACX__ON               0x2C
 
 /* ISACX/IPACX _CMDRD (W) */
 #define ISACX_CMDRD_XRES        0x01
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c
index cb428b9ee441..aa9b6c3cadc1 100644
--- a/drivers/isdn/hardware/mISDN/mISDNipac.c
+++ b/drivers/isdn/hardware/mISDN/mISDNipac.c
@@ -80,6 +80,7 @@ isac_ph_state_bh(struct dchannel *dch)
                 l1_event(dch->l1, HW_DEACT_CNF);
                 break;
         case ISAC_IND_DR:
+        case ISAC_IND_DR6:
                 dch->state = 3;
                 l1_event(dch->l1, HW_DEACT_IND);
                 break;
@@ -660,6 +661,7 @@ isac_l1cmd(struct dchannel *dch, u32 cmd)
                 spin_lock_irqsave(isac->hwlock, flags);
                 if ((isac->state == ISAC_IND_EI) ||
                     (isac->state == ISAC_IND_DR) ||
+                    (isac->state == ISAC_IND_DR6) ||
                     (isac->state == ISAC_IND_RS))
                         ph_command(isac, ISAC_CMD_TIM);
                 else