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

Pull networking updates from David Miller:
 "Highlights:

   1) Maintain the TCP retransmit queue using an rbtree, with 1GB
      windows at 100Gb this really has become necessary. From Eric
      Dumazet.

   2) Multi-program support for cgroup+bpf, from Alexei Starovoitov.

   3) Perform broadcast flooding in hardware in mv88e6xxx, from Andrew
      Lunn.

   4) Add meter action support to openvswitch, from Andy Zhou.

   5) Add a data meta pointer for BPF accessible packets, from Daniel
      Borkmann.

   6) Namespace-ify almost all TCP sysctl knobs, from Eric Dumazet.

   7) Turn on Broadcom Tags in b53 driver, from Florian Fainelli.

   8) More work to move the RTNL mutex down, from Florian Westphal.

   9) Add 'bpftool' utility, to help with bpf program introspection.
      From Jakub Kicinski.

  10) Add new 'cpumap' type for XDP_REDIRECT action, from Jesper
      Dangaard Brouer.

  11) Support 'blocks' of transformations in the packet scheduler which
      can span multiple network devices, from Jiri Pirko.

  12) TC flower offload support in cxgb4, from Kumar Sanghvi.

  13) Priority based stream scheduler for SCTP, from Marcelo Ricardo
      Leitner.

  14) Thunderbolt networking driver, from Amir Levy and Mika Westerberg.

  15) Add RED qdisc offloadability, and use it in mlxsw driver. From
      Nogah Frankel.

  16) eBPF based device controller for cgroup v2, from Roman Gushchin.

  17) Add some fundamental tracepoints for TCP, from Song Liu.

  18) Remove garbage collection from ipv6 route layer, this is a
      significant accomplishment. From Wei Wang.

  19) Add multicast route offload support to mlxsw, from Yotam Gigi"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2177 commits)
  tcp: highest_sack fix
  geneve: fix fill_info when link down
  bpf: fix lockdep splat
  net: cdc_ncm: GetNtbFormat endian fix
  openvswitch: meter: fix NULL pointer dereference in ovs_meter_cmd_reply_start
  netem: remove unnecessary 64 bit modulus
  netem: use 64 bit divide by rate
  tcp: Namespace-ify sysctl_tcp_default_congestion_control
  net: Protect iterations over net::fib_notifier_ops in fib_seq_sum()
  ipv6: set all.accept_dad to 0 by default
  uapi: fix linux/tls.h userspace compilation error
  usbnet: ipheth: prevent TX queue timeouts when device not ready
  vhost_net: conditionally enable tx polling
  uapi: fix linux/rxrpc.h userspace compilation errors
  net: stmmac: fix LPI transitioning for dwmac4
  atm: horizon: Fix irq release error
  net-sysfs: trigger netlink notification on ifalias change via sysfs
  openvswitch: Using kfree_rcu() to simplify the code
  openvswitch: Make local function ovs_nsh_key_attr_size() static
  openvswitch: Fix return value check in ovs_meter_cmd_features()
  ...

7 files changed, 31 insertions, 21 deletions

diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f8b7e86907cc..126855e6cb7d 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -358,26 +358,33 @@ fore200e_shutdown(struct fore200e* fore200e)
     case FORE200E_STATE_COMPLETE:
         kfree(fore200e->stats);
 
+        /* fall through */
     case FORE200E_STATE_IRQ:
         free_irq(fore200e->irq, fore200e->atm_dev);
 
+        /* fall through */
     case FORE200E_STATE_ALLOC_BUF:
         fore200e_free_rx_buf(fore200e);
 
+        /* fall through */
     case FORE200E_STATE_INIT_BSQ:
         fore200e_uninit_bs_queue(fore200e);
 
+        /* fall through */
     case FORE200E_STATE_INIT_RXQ:
         fore200e->bus->dma_chunk_free(fore200e, &fore200e->host_rxq.status);
         fore200e->bus->dma_chunk_free(fore200e, &fore200e->host_rxq.rpd);
 
+        /* fall through */
     case FORE200E_STATE_INIT_TXQ:
         fore200e->bus->dma_chunk_free(fore200e, &fore200e->host_txq.status);
         fore200e->bus->dma_chunk_free(fore200e, &fore200e->host_txq.tpd);
 
+        /* fall through */
     case FORE200E_STATE_INIT_CMDQ:
         fore200e->bus->dma_chunk_free(fore200e, &fore200e->host_cmdq.status);
 
+        /* fall through */
     case FORE200E_STATE_INITIALIZE:
         /* nothing to do for that state */
 
@@ -390,6 +397,7 @@ fore200e_shutdown(struct fore200e* fore200e)
     case FORE200E_STATE_MAP:
         fore200e->bus->unmap(fore200e);
 
+        /* fall through */
     case FORE200E_STATE_CONFIGURE:
         /* nothing to do for that state */
 
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
index 7e76b35f422c..e121b8485731 100644
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
@@ -2803,7 +2803,7 @@ out:
         return err;
 
 out_free_irq:
-        free_irq(dev->irq, dev);
+        free_irq(irq, dev);
 out_free:
         kfree(dev);
 out_release:
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c
index 57af9fd198e4..909744eb7bab 100644
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.c
@@ -306,11 +306,9 @@ static int idt77105_start(struct atm_dev *dev)
         if (start_timer) {
                 start_timer = 0;
                 
-                setup_timer(&stats_timer, idt77105_stats_timer_func, 0UL);
                 stats_timer.expires = jiffies+IDT77105_STATS_TIMER_PERIOD;
                 add_timer(&stats_timer);
                 
-                setup_timer(&restart_timer, idt77105_restart_timer_func, 0UL);
                 restart_timer.expires = jiffies+IDT77105_RESTART_TIMER_PERIOD;
                 add_timer(&restart_timer);
         }
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
index 47f3c4ae0594..0e3b9c44c808 100644
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
@@ -2073,21 +2073,19 @@ idt77252_rate_logindex(struct idt77252_dev *card, int pcr)
 }
 
 static void
-idt77252_est_timer(unsigned long data)
+idt77252_est_timer(struct timer_list *t)
 {
-        struct vc_map *vc = (struct vc_map *)data;
+        struct rate_estimator *est = from_timer(est, t, timer);
+        struct vc_map *vc = est->vc;
         struct idt77252_dev *card = vc->card;
-        struct rate_estimator *est;
         unsigned long flags;
         u32 rate, cps;
         u64 ncells;
         u8 lacr;
 
         spin_lock_irqsave(&vc->lock, flags);
-        est = vc->estimator;
-        if (!est)
+        if (!vc->estimator)
                 goto out;
-
         ncells = est->cells;
 
         rate = ((u32)(ncells - est->last_cells)) << (7 - est->interval);
@@ -2126,10 +2124,11 @@ idt77252_init_est(struct vc_map *vc, int pcr)
         est->maxcps = pcr < 0 ? -pcr : pcr;
         est->cps = est->maxcps;
         est->avcps = est->cps << 5;
+        est->vc = vc;
 
         est->interval = 2;              /* XXX: make this configurable */
         est->ewma_log = 2;              /* XXX: make this configurable */
-        setup_timer(&est->timer, idt77252_est_timer, (unsigned long)vc);
+        timer_setup(&est->timer, idt77252_est_timer, 0);
         mod_timer(&est->timer, jiffies + ((HZ / 4) << est->interval));
 
         return est;
@@ -2209,16 +2208,20 @@ static int
 idt77252_init_ubr(struct idt77252_dev *card, struct vc_map *vc,
                   struct atm_vcc *vcc, struct atm_qos *qos)
 {
+        struct rate_estimator *est = NULL;
         unsigned long flags;
         int tcr;
 
         spin_lock_irqsave(&vc->lock, flags);
         if (vc->estimator) {
-                del_timer(&vc->estimator->timer);
-                kfree(vc->estimator);
+                est = vc->estimator;
                 vc->estimator = NULL;
         }
         spin_unlock_irqrestore(&vc->lock, flags);
+        if (est) {
+                del_timer_sync(&est->timer);
+                kfree(est);
+        }
 
         tcr = atm_pcr_goal(&qos->txtp);
         if (tcr == 0)
diff --git a/drivers/atm/idt77252.h b/drivers/atm/idt77252.h
index 3a82cc23a053..9339197d701c 100644
--- a/drivers/atm/idt77252.h
+++ b/drivers/atm/idt77252.h
@@ -184,6 +184,8 @@ struct aal1 {
         unsigned char           sequence;
 };
 
+struct vc_map;
+
 struct rate_estimator {
         struct timer_list       timer;
         unsigned int            interval;
@@ -193,6 +195,7 @@ struct rate_estimator {
         long                    avcps;
         u32                     cps;
         u32                     maxcps;
+        struct vc_map           *vc;
 };
 
 struct vc_map {
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
index ad6b582c268e..12f646760b68 100644
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
@@ -880,7 +880,7 @@ static void ia_phy_write(struct iadev_priv *iadev,
 
 static void ia_suni_pm7345_init_ds3(struct iadev_priv *iadev)
 {
-        static const struct ia_reg suni_ds3_init [] = {
+        static const struct ia_reg suni_ds3_init[] = {
                 { SUNI_DS3_FRM_INTR_ENBL,       0x17 },
                 { SUNI_DS3_FRM_CFG,             0x01 },
                 { SUNI_DS3_TRAN_CFG,            0x01 },
@@ -898,7 +898,7 @@ static void ia_suni_pm7345_init_ds3(struct iadev_priv *iadev)
 
 static void ia_suni_pm7345_init_e3(struct iadev_priv *iadev)
 {
-        static const struct ia_reg suni_e3_init [] = {
+        static const struct ia_reg suni_e3_init[] = {
                 { SUNI_E3_FRM_FRAM_OPTIONS,             0x04 },
                 { SUNI_E3_FRM_MAINT_OPTIONS,            0x20 },
                 { SUNI_E3_FRM_FRAM_INTR_ENBL,           0x1d },
@@ -918,7 +918,7 @@ static void ia_suni_pm7345_init_e3(struct iadev_priv *iadev)
 
 static void ia_suni_pm7345_init(struct iadev_priv *iadev)
 {
-        static const struct ia_reg suni_init [] = {
+        static const struct ia_reg suni_init[] = {
                 /* Enable RSOP loss of signal interrupt. */
                 { SUNI_INTR_ENBL,               0x28 },
                 /* Clear error counters. */
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
index b0363149b2fd..b8825f2d79e0 100644
--- a/drivers/atm/suni.c
+++ b/drivers/atm/suni.c
@@ -53,7 +53,7 @@ static DEFINE_SPINLOCK(sunis_lock);
     if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
 
 
-static void suni_hz(unsigned long from_timer)
+static void suni_hz(struct timer_list *timer)
 {
         struct suni_priv *walk;
         struct atm_dev *dev;
@@ -85,7 +85,7 @@ static void suni_hz(unsigned long from_timer)
                     ((GET(TACP_TCC) & 0xff) << 8) |
                     ((GET(TACP_TCCM) & 7) << 16));
         }
-        if (from_timer) mod_timer(&poll_timer,jiffies+HZ);
+        if (timer) mod_timer(&poll_timer,jiffies+HZ);
 }
 
 
@@ -322,13 +322,11 @@ static int suni_start(struct atm_dev *dev)
                 printk(KERN_WARNING "%s(itf %d): no signal\n",dev->type,
                     dev->number);
         PRIV(dev)->loop_mode = ATM_LM_NONE;
-        suni_hz(0); /* clear SUNI counters */
+        suni_hz(NULL); /* clear SUNI counters */
         (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
         if (first) {
-                init_timer(&poll_timer);
+                timer_setup(&poll_timer, suni_hz, 0);
                 poll_timer.expires = jiffies+HZ;
-                poll_timer.function = suni_hz;
-                poll_timer.data = 1;
 #if 0
 printk(KERN_DEBUG "[u] p=0x%lx,n=0x%lx\n",(unsigned long) poll_timer.list.prev,
     (unsigned long) poll_timer.list.next);