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

Pull networking updates from David Millar:
 "Here are some highlights from the 2065 networking commits that
  happened this development cycle:

   1) XDP support for IXGBE (John Fastabend) and thunderx (Sunil Kowuri)

   2) Add a generic XDP driver, so that anyone can test XDP even if they
      lack a networking device whose driver has explicit XDP support
      (me).

   3) Sparc64 now has an eBPF JIT too (me)

   4) Add a BPF program testing framework via BPF_PROG_TEST_RUN (Alexei
      Starovoitov)

   5) Make netfitler network namespace teardown less expensive (Florian
      Westphal)

   6) Add symmetric hashing support to nft_hash (Laura Garcia Liebana)

   7) Implement NAPI and GRO in netvsc driver (Stephen Hemminger)

   8) Support TC flower offload statistics in mlxsw (Arkadi Sharshevsky)

   9) Multiqueue support in stmmac driver (Joao Pinto)

  10) Remove TCP timewait recycling, it never really could possibly work
      well in the real world and timestamp randomization really zaps any
      hint of usability this feature had (Soheil Hassas Yeganeh)

  11) Support level3 vs level4 ECMP route hashing in ipv4 (Nikolay
      Aleksandrov)

  12) Add socket busy poll support to epoll (Sridhar Samudrala)

  13) Netlink extended ACK support (Johannes Berg, Pablo Neira Ayuso,
      and several others)

  14) IPSEC hw offload infrastructure (Steffen Klassert)"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2065 commits)
  tipc: refactor function tipc_sk_recv_stream()
  tipc: refactor function tipc_sk_recvmsg()
  net: thunderx: Optimize page recycling for XDP
  net: thunderx: Support for XDP header adjustment
  net: thunderx: Add support for XDP_TX
  net: thunderx: Add support for XDP_DROP
  net: thunderx: Add basic XDP support
  net: thunderx: Cleanup receive buffer allocation
  net: thunderx: Optimize CQE_TX handling
  net: thunderx: Optimize RBDR descriptor handling
  net: thunderx: Support for page recycling
  ipx: call ipxitf_put() in ioctl error path
  net: sched: add helpers to handle extended actions
  qed*: Fix issues in the ptp filter config implementation.
  qede: Fix concurrency issue in PTP Tx path processing.
  stmmac: Add support for SIMATIC IOT2000 platform
  net: hns: fix ethtool_get_strings overflow in hns driver
  tcp: fix wraparound issue in tcp_lp
  bpf, arm64: fix jit branch offset related to ldimm64
  bpf, arm64: implement jiting of BPF_XADD
  ...

2 files changed, 9 insertions, 10 deletions

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 7c7ae0890e90..729a7da90b5b 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1134,7 +1134,6 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)
                 u32 buf_len = skb_frag_size(frag);
                 dma_addr_t desc_dma;
                 u32 desc_dma_32;
-                u32 pkt_info;
 
                 dma_addr = dma_map_page(dev, page, page_offset, buf_len,
                                         DMA_TO_DEVICE);
@@ -1151,9 +1150,6 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)
                 }
 
                 desc_dma = knav_pool_desc_virt_to_dma(netcp->tx_pool, ndesc);
-                pkt_info =
-                        (netcp->tx_compl_qid & KNAV_DMA_DESC_RETQ_MASK) <<
-                                KNAV_DMA_DESC_RETQ_SHIFT;
                 set_pkt_info(dma_addr, buf_len, 0, ndesc);
                 desc_dma_32 = (u32)desc_dma;
                 set_words(&desc_dma_32, 1, &pdesc->next_desc);
@@ -1882,6 +1878,7 @@ static u16 netcp_select_queue(struct net_device *dev, struct sk_buff *skb,
 static int netcp_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
                           struct tc_to_netdev *tc)
 {
+        u8 num_tc;
         int i;
 
         /* setup tc must be called under rtnl lock */
@@ -1890,15 +1887,18 @@ static int netcp_setup_tc(struct net_device *dev, u32 handle, __be16 proto,
         if (tc->type != TC_SETUP_MQPRIO)
                 return -EINVAL;
 
+        tc->mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
+        num_tc = tc->mqprio->num_tc;
+
         /* Sanity-check the number of traffic classes requested */
         if ((dev->real_num_tx_queues <= 1) ||
-            (dev->real_num_tx_queues < tc->tc))
+            (dev->real_num_tx_queues < num_tc))
                 return -EINVAL;
 
         /* Configure traffic class to queue mappings */
-        if (tc->tc) {
-                netdev_set_num_tc(dev, tc->tc);
-                for (i = 0; i < tc->tc; i++)
+        if (num_tc) {
+                netdev_set_num_tc(dev, num_tc);
+                for (i = 0; i < num_tc; i++)
                         netdev_set_tc_queue(dev, i, 1, i);
         } else {
                 netdev_reset_tc(dev);
diff --git a/drivers/net/ethernet/ti/netcp_ethss.c b/drivers/net/ethernet/ti/netcp_ethss.c
index eece3e2eec14..897176fc5043 100644
--- a/drivers/net/ethernet/ti/netcp_ethss.c
+++ b/drivers/net/ethernet/ti/netcp_ethss.c
@@ -3048,8 +3048,7 @@ static void init_secondary_ports(struct gbe_priv *gbe_dev,
         for_each_child_of_node(node, port) {
                 slave = devm_kzalloc(dev, sizeof(*slave), GFP_KERNEL);
                 if (!slave) {
-                        dev_err(dev,
-                                "memomry alloc failed for secondary port(%s), skipping...\n",
+                        dev_err(dev, "memory alloc failed for secondary port(%s), skipping...\n",
                                 port->name);
                         continue;
                 }