Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue (dc096288) · Commits · 戴 / test

Tony Nguyen says: ==================== Intel Wired LAN Driver Updates 2020-07-30 This series contains updates to the e1000e and igb drivers. Aaron Ma allows PHY initialization to continue if ULP disable failed for e1000e. Francesco Ruggeri fixes race conditions in igb reset that could cause panics. ==================== Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/ethernet/intel/e1000e/ich8lan.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -301,10 +301,8 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1000_hw *hw)
		*/
		hw->dev_spec.ich8lan.ulp_state = e1000_ulp_state_unknown;
		ret_val = e1000_disable_ulp_lpt_lp(hw, true);
		if (ret_val) {
		if (ret_val)
		e_warn("Failed to disable ULP\n");
		goto out;
		}

		ret_val = hw->phy.ops.acquire(hw);
		if (ret_val) {

drivers/net/ethernet/intel/igb/igb_main.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -6224,9 +6224,18 @@ static void igb_reset_task(struct work_struct *work)
		struct igb_adapter *adapter;
		adapter = container_of(work, struct igb_adapter, reset_task);

		rtnl_lock();
		/* If we're already down or resetting, just bail */
		if (test_bit(__IGB_DOWN, &adapter->state) \|\|
		test_bit(__IGB_RESETTING, &adapter->state)) {
		rtnl_unlock();
		return;
		}

		igb_dump(adapter);
		netdev_err(adapter->netdev, "Reset adapter\n");
		igb_reinit_locked(adapter);
		rtnl_unlock();
		}

		/**

Admin message