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

Commit 0c86a6bd 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 a reference to a module parameter which was lost during the
    GREv6 receive path rewrite, from Alexey Kodanev.

 2) Fix deref before NULL check in ipheth, from Gustavo A. R. Silva.

 3) RCU read lock imbalance in tun_build_skb(), from Xin Long.

 4) Some stragglers from the mac80211 folks:

      a) Timer conversions from Kees Cook

      b) Fix some sequencing issue when cfg80211 is built statically,
         from Johannes Berg

      c) Memory leak in mac80211_hwsim, from Ben Hutchings.

 5) Add new qmi_wwan device ID, from Sebastian Sjoholm.

 6) Fix use after free in tipc, from Jon Maloy.

 7) Missing kdoc in nfp driver, from Jakub Kicinski.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  nfp: flower: add missing kdoc
  tipc: fix access of released memory
  net: qmi_wwan: add Quectel BG96 2c7c:0296
  mlxsw: spectrum: Do not try to create non-existing ports during unsplit
  mac80211: properly free requested-but-not-started TX agg sessions
  mac80211_hwsim: Fix memory leak in hwsim_new_radio_nl()
  cfg80211: initialize regulatory keys/database later
  mac80211: aggregation: Convert timers to use timer_setup()
  nl80211: don't expose wdev->ssid for most interfaces
  mac80211: Convert timers to use timer_setup()
  net: vxge: Fix some indentation issues
  net: ena: fix race condition between device reset and link up setup
  r8169: use same RTL8111EVL green settings as in vendor driver
  r8169: fix RTL8111EVL EEE and green settings
  tun: fix rcu_read_lock imbalance in tun_build_skb
  tcp: when scheduling TLP, time of RTO should account for current ACK
  usbnet: ipheth: fix potential null pointer dereference in ipheth_carrier_set
  gre6: use log_ecn_error module parameter in ip6_tnl_rcv()
parents b620fd2d a13e8d41

drivers/net/ethernet/amazon/ena/ena_netdev.c

+9 −2
Original line number Diff line number Diff line
@@ -2579,6 +2579,7 @@ static int ena_restore_device(struct ena_adapter *adapter) 
	bool wd_state;

	int rc;



	set_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);

	rc = ena_device_init(ena_dev, adapter->pdev, &get_feat_ctx, &wd_state);

	if (rc) {

		dev_err(&pdev->dev, "Can not initialize device\n");
@@ -2592,6 +2593,11 @@ static int ena_restore_device(struct ena_adapter *adapter) 
		goto err_device_destroy;

	}



	clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);

	/* Make sure we don't have a race with AENQ Links state handler */

	if (test_bit(ENA_FLAG_LINK_UP, &adapter->flags))

		netif_carrier_on(adapter->netdev);



	rc = ena_enable_msix_and_set_admin_interrupts(adapter,

						      adapter->num_queues);

	if (rc) {
@@ -2618,7 +2624,7 @@ static int ena_restore_device(struct ena_adapter *adapter) 
	ena_com_admin_destroy(ena_dev);

err:

	clear_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);



	clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);

	dev_err(&pdev->dev,

		"Reset attempt failed. Can not reset the device\n");
@@ -3495,6 +3501,7 @@ static void ena_update_on_link_change(void *adapter_data, 
	if (status) {

		netdev_dbg(adapter->netdev, "%s\n", __func__);

		set_bit(ENA_FLAG_LINK_UP, &adapter->flags);

		if (!test_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags))

			netif_carrier_on(adapter->netdev);

	} else {

		clear_bit(ENA_FLAG_LINK_UP, &adapter->flags);

drivers/net/ethernet/amazon/ena/ena_netdev.h

+2 −1
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ enum ena_flags_t { 
	ENA_FLAG_DEV_UP,

	ENA_FLAG_LINK_UP,

	ENA_FLAG_MSIX_ENABLED,

	ENA_FLAG_TRIGGER_RESET

	ENA_FLAG_TRIGGER_RESET,

	ENA_FLAG_ONGOING_RESET

};



/* adapter specific private data structure */

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+7 −1
Original line number Diff line number Diff line
@@ -3142,13 +3142,17 @@ static int mlxsw_sp_ports_create(struct mlxsw_sp *mlxsw_sp) 
	if (!mlxsw_sp->ports)

		return -ENOMEM;



	mlxsw_sp->port_to_module = kcalloc(max_ports, sizeof(u8), GFP_KERNEL);

	mlxsw_sp->port_to_module = kmalloc_array(max_ports, sizeof(int),

						 GFP_KERNEL);

	if (!mlxsw_sp->port_to_module) {

		err = -ENOMEM;

		goto err_port_to_module_alloc;

	}



	for (i = 1; i < max_ports; i++) {

		/* Mark as invalid */

		mlxsw_sp->port_to_module[i] = -1;



		err = mlxsw_sp_port_module_info_get(mlxsw_sp, i, &module,

						    &width, &lane);

		if (err)
@@ -3216,6 +3220,8 @@ static void mlxsw_sp_port_unsplit_create(struct mlxsw_sp *mlxsw_sp, 


	for (i = 0; i < count; i++) {

		local_port = base_port + i * 2;

		if (mlxsw_sp->port_to_module[local_port] < 0)

			continue;

		module = mlxsw_sp->port_to_module[local_port];



		mlxsw_sp_port_create(mlxsw_sp, local_port, false, module,

drivers/net/ethernet/mellanox/mlxsw/spectrum.h

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ struct mlxsw_sp { 
	const struct mlxsw_bus_info *bus_info;

	unsigned char base_mac[ETH_ALEN];

	struct mlxsw_sp_upper *lags;

	u8 *port_to_module;

	int *port_to_module;

	struct mlxsw_sp_sb *sb;

	struct mlxsw_sp_bridge *bridge;

	struct mlxsw_sp_router *router;

drivers/net/ethernet/neterion/vxge/vxge-main.c

+18 −19
Original line number Diff line number Diff line
@@ -2495,8 +2495,7 @@ static int vxge_add_isr(struct vxgedev *vdev) 
					pci_fun, vp_idx);

				ret = request_irq(

					vdev->entries[intr_cnt].vector,

					vxge_rx_msix_napi_handle,

					0,

					vxge_rx_msix_napi_handle, 0,

					vdev->desc[intr_cnt],

					&vdev->vpaths[vp_idx].ring);

				vdev->vxge_entries[intr_cnt].arg =
@@ -2512,8 +2511,8 @@ static int vxge_add_isr(struct vxgedev *vdev) 
				vxge_rem_msix_isr(vdev);

				vdev->config.intr_type = INTA;

				vxge_debug_init(VXGE_ERR,

					"%s: Defaulting to INTA"

					, vdev->ndev->name);

					"%s: Defaulting to INTA",

					vdev->ndev->name);

				goto INTA_MODE;

			}