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

Commit 6d9e5130 authored by Nicolas Schichan's avatar Nicolas Schichan Committed by Jeff Kirsher
Browse files

e1000: always call e1000_check_for_link() on e1000_ce4100 MACs. 



Interrupts about link lost or rx sequence errors are not reported by
the ce4100 hardware, leading to transitions from link UP to link DOWN
never being reported.

Signed-off-by: default avatarNicolas Schichan <nschichan@freebox.fr>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 61463a30

drivers/net/e1000/e1000_main.c

+7 −4
Original line number Diff line number Diff line
@@ -2402,13 +2402,16 @@ bool e1000_has_link(struct e1000_adapter *adapter) 
	struct e1000_hw *hw = &adapter->hw;

	bool link_active = false;



	/* get_link_status is set on LSC (link status) interrupt or

	 * rx sequence error interrupt.  get_link_status will stay

	 * false until the e1000_check_for_link establishes link

	 * for copper adapters ONLY

	/* get_link_status is set on LSC (link status) interrupt or rx

	 * sequence error interrupt (except on intel ce4100).

	 * get_link_status will stay false until the

	 * e1000_check_for_link establishes link for copper adapters

	 * ONLY

	 */

	switch (hw->media_type) {

	case e1000_media_type_copper:

		if (hw->mac_type == e1000_ce4100)

			hw->get_link_status = 1;

		if (hw->get_link_status) {

			e1000_check_for_link(hw);

			link_active = !hw->get_link_status;