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

Commit 6a7dd172 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ena-races' 



Arthur Kiyanovski says:

====================
net: ena: race condition bug fix and version update

This patchset includes a fix to a race condition that can cause
kernel panic, as well as a driver version update because of this
fix.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fc62814d d9b8656d

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

+5 −5
Original line number Diff line number Diff line
@@ -2663,11 +2663,6 @@ 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) {
@@ -2684,6 +2679,11 @@ static int ena_restore_device(struct ena_adapter *adapter) 
	}



	set_bit(ENA_FLAG_DEVICE_RUNNING, &adapter->flags);



	clear_bit(ENA_FLAG_ONGOING_RESET, &adapter->flags);

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

		netif_carrier_on(adapter->netdev);



	mod_timer(&adapter->timer_service, round_jiffies(jiffies + HZ));

	dev_err(&pdev->dev,

		"Device reset completed successfully, Driver info: %s\n",

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


#define DRV_MODULE_VER_MAJOR	2

#define DRV_MODULE_VER_MINOR	0

#define DRV_MODULE_VER_SUBMINOR 2

#define DRV_MODULE_VER_SUBMINOR 3



#define DRV_MODULE_NAME		"ena"

#ifndef DRV_MODULE_VERSION