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

Pull networking fixes from David Miller:
 "Hopefully this is the last batch of networking fixes for 4.14

  Fingers crossed...

   1) Fix stmmac to use the proper sized OF property read, from Bhadram
      Varka.

   2) Fix use after free in net scheduler tc action code, from Cong
      Wang.

   3) Fix SKB control block mangling in tcp_make_synack().

   4) Use proper locking in fib_dump_info(), from Florian Westphal.

   5) Fix IPG encodings in systemport driver, from Florian Fainelli.

   6) Fix division by zero in NV TCP congestion control module, from
      Konstantin Khlebnikov.

   7) Fix use after free in nf_reject_ipv4, from Tejaswi Tanikella"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  net: systemport: Correct IPG length settings
  tcp: do not mangle skb->cb[] in tcp_make_synack()
  fib: fib_dump_info can no longer use __in_dev_get_rtnl
  stmmac: use of_property_read_u32 instead of read_u8
  net_sched: hold netns refcnt for each action
  net_sched: acquire RTNL in tc_action_net_exit()
  net: vrf: correct FRA_L3MDEV encode type
  tcp_nv: fix division by zero in tcpnv_acked()
  netfilter: nf_reject_ipv4: Fix use-after-free in send_reset
  netfilter: nft_set_hash: disable fast_ops for 2-len keys

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index 108739ff9223..32feac5bbd75 100644
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -126,14 +126,14 @@ struct stmmac_axi {
 
 struct stmmac_rxq_cfg {
         u8 mode_to_use;
-        u8 chan;
+        u32 chan;
         u8 pkt_route;
         bool use_prio;
         u32 prio;
 };
 
 struct stmmac_txq_cfg {
-        u8 weight;
+        u32 weight;
         u8 mode_to_use;
         /* Credit Base Shaper parameters */
         u32 send_slope;
@@ -168,8 +168,8 @@ struct plat_stmmacenet_data {
         int unicast_filter_entries;
         int tx_fifo_size;
         int rx_fifo_size;
-        u8 rx_queues_to_use;
-        u8 tx_queues_to_use;
+        u32 rx_queues_to_use;
+        u32 tx_queues_to_use;
         u8 rx_sched_algorithm;
         u8 tx_sched_algorithm;
         struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];