Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29fbff86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull networking fixes from David Miller:

 1) Fix various build warnings in tlan/qed/xen-netback drivers, from
    Arnd Bergmann.

 2) Propagate proper error code in strparser's strp_recv(), from Geert
    Uytterhoeven.

 3) Fix accidental broadcast of RTM_GETTFILTER responses, from Eric
    Dumazret.

 4) Need to use list_for_each_entry_safe() in qed driver, from Wei
    Yongjun.

 5) Openvswitch 802.1AD bug fixes from Jiri Benc.

 6) Cure BUILD_BUG_ON() in mlx5 driver, from Tom Herbert.

 7) Fix UDP ipv6 checksumming in netvsc driver, from Stephen Hemminger.

 8) stmmac driver fixes from Giuseppe CAVALLARO.

 9) Fix access to mangled IP6CB in tcp, from Eric Dumazet.

10) Fix info leaks in tipc and rtnetlink, from Dan Carpenter.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (27 commits)
  net: bridge: add the multicast_flood flag attribute to brport_attrs
  net: axienet: Remove unused parameter from __axienet_device_reset
  liquidio: CN23XX: fix a loop timeout
  net: rtnl: info leak in rtnl_fill_vfinfo()
  tipc: info leak in __tipc_nl_add_udp_addr()
  net: ipv4: Do not drop to make_route if oif is l3mdev
  net: phy: Trigger state machine on state change and not polling.
  ipv6: tcp: restore IP6CB for pktoptions skbs
  netvsc: Remove mistaken udp.h inclusion.
  xen-netback: fix type mismatch warning
  stmmac: fix error check when init ptp
  stmmac: fix ptp init for gmac4
  qed: fix old-style function definition
  netvsc: fix checksum on UDP IPV6
  net_sched: reorder pernet ops and act ops registrations
  xen-netback: fix guest Rx stall detection (after guest Rx refactor)
  drivers/ptp: Fix kernel memory disclosure
  net/mlx5: Add MLX5_ARRAY_SET64 to fix BUILD_BUG_ON
  qmi_wwan: add support for Quectel EC21 and EC25
  openvswitch: add NETIF_F_HW_VLAN_STAG_TX to internal dev
  ...
parents c4a86165 4eb6753c

drivers/net/ethernet/cavium/liquidio/cn23xx_pf_device.c

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ static int cn23xx_enable_io_queues(struct octeon_device *oct) 
				while ((reg_val & CN23XX_PKT_INPUT_CTL_RST) &&

				       !(reg_val &

					 CN23XX_PKT_INPUT_CTL_QUIET) &&

				       loop--) {

				       --loop) {

					reg_val = octeon_read_csr64(

					    oct,

					    CN23XX_SLI_IQ_PKT_CONTROL64(q_no));

drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c

+2 −2
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int give_pages(struct mlx5_core_dev *dev, u16 func_id, int npages, 


			goto retry;

		}

		MLX5_SET64(manage_pages_in, in, pas[i], addr);

		MLX5_ARRAY_SET64(manage_pages_in, in, pas, i, addr);

	}



	MLX5_SET(manage_pages_in, in, opcode, MLX5_CMD_OP_MANAGE_PAGES);
@@ -344,7 +344,7 @@ static int reclaim_pages_cmd(struct mlx5_core_dev *dev, 
		if (fwp->func_id != func_id)

			continue;



		MLX5_SET64(manage_pages_out, out, pas[i], fwp->addr);

		MLX5_ARRAY_SET64(manage_pages_out, out, pas, i, fwp->addr);

		i++;

	}

drivers/net/ethernet/qlogic/qed/qed_ll2.c

+2 −2
Original line number Diff line number Diff line
@@ -1517,7 +1517,7 @@ static void qed_ll2_register_cb_ops(struct qed_dev *cdev, 
static int qed_ll2_start(struct qed_dev *cdev, struct qed_ll2_params *params)

{

	struct qed_ll2_info ll2_info;

	struct qed_ll2_buffer *buffer;

	struct qed_ll2_buffer *buffer, *tmp_buffer;

	enum qed_ll2_conn_type conn_type;

	struct qed_ptt *p_ptt;

	int rc, i;
@@ -1587,7 +1587,7 @@ static int qed_ll2_start(struct qed_dev *cdev, struct qed_ll2_params *params) 


	/* Post all Rx buffers to FW */

	spin_lock_bh(&cdev->ll2->lock);

	list_for_each_entry(buffer, &cdev->ll2->list, list) {

	list_for_each_entry_safe(buffer, tmp_buffer, &cdev->ll2->list, list) {

		rc = qed_ll2_post_rx_buffer(QED_LEADING_HWFN(cdev),

					    cdev->ll2->handle,

					    buffer->phys_addr, 0, buffer, 1);

drivers/net/ethernet/qlogic/qed/qed_roce.c

+1 −1
Original line number Diff line number Diff line
@@ -2947,7 +2947,7 @@ static const struct qed_rdma_ops qed_rdma_ops_pass = { 
	.roce_ll2_stats = &qed_roce_ll2_stats,

};



const struct qed_rdma_ops *qed_get_rdma_ops()

const struct qed_rdma_ops *qed_get_rdma_ops(void)

{

	return &qed_rdma_ops_pass;

}

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+14 −7
Original line number Diff line number Diff line
@@ -650,20 +650,27 @@ static int stmmac_init_ptp(struct stmmac_priv *priv) 
	if (IS_ERR(priv->clk_ptp_ref)) {

		priv->clk_ptp_rate = clk_get_rate(priv->stmmac_clk);

		priv->clk_ptp_ref = NULL;

		netdev_dbg(priv->dev, "PTP uses main clock\n");

	} else {

		clk_prepare_enable(priv->clk_ptp_ref);

		priv->clk_ptp_rate = clk_get_rate(priv->clk_ptp_ref);

		netdev_dbg(priv->dev, "PTP rate %d\n", priv->clk_ptp_rate);

	}



	priv->adv_ts = 0;

	if (priv->dma_cap.atime_stamp && priv->extend_desc)

	/* Check if adv_ts can be enabled for dwmac 4.x core */

	if (priv->plat->has_gmac4 && priv->dma_cap.atime_stamp)

		priv->adv_ts = 1;

	/* Dwmac 3.x core with extend_desc can support adv_ts */

	else if (priv->extend_desc && priv->dma_cap.atime_stamp)

		priv->adv_ts = 1;



	if (netif_msg_hw(priv) && priv->dma_cap.time_stamp)

		pr_debug("IEEE 1588-2002 Time Stamp supported\n");

	if (priv->dma_cap.time_stamp)

		netdev_info(priv->dev, "IEEE 1588-2002 Timestamp supported\n");



	if (netif_msg_hw(priv) && priv->adv_ts)

		pr_debug("IEEE 1588-2008 Advanced Time Stamp supported\n");

	if (priv->adv_ts)

		netdev_info(priv->dev,

			    "IEEE 1588-2008 Advanced Timestamp supported\n");



	priv->hw->ptp = &stmmac_ptp;

	priv->hwts_tx_en = 0;
@@ -1702,8 +1709,8 @@ static int stmmac_hw_setup(struct net_device *dev, bool init_ptp) 


	if (init_ptp) {

		ret = stmmac_init_ptp(priv);

		if (ret && ret != -EOPNOTSUPP)

			pr_warn("%s: failed PTP initialisation\n", __func__);

		if (ret)

			netdev_warn(priv->dev, "PTP support cannot init.\n");

	}



#ifdef CONFIG_DEBUG_FS