e1000e: Fix e1000_check_for_copper_link_ich8lan return value.
authorBenjamin Poirier <bpoirier@suse.com>
Mon, 11 Dec 2017 07:26:40 +0000 (16:26 +0900)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 3 Mar 2018 15:50:54 +0000 (15:50 +0000)
commita8aa550c5389159756696f95e833de8f776c273c
treeb92d5e552209810f2a13894315c6147cade1d210
parentac8f81b0f33b6264fa60163ca2510e7af2ec38bb
e1000e: Fix e1000_check_for_copper_link_ich8lan return value.

commit 4110e02eb45ea447ec6f5459c9934de0a273fb91 upstream.

e1000e_check_for_copper_link() and e1000_check_for_copper_link_ich8lan()
are the two functions that may be assigned to mac.ops.check_for_link when
phy.media_type == e1000_media_type_copper. Commit 19110cfbb34d ("e1000e:
Separate signaling for link check/link up") changed the meaning of the
return value of check_for_link for copper media but only adjusted the first
function. This patch adjusts the second function likewise.

Reported-by: Christian Hesse <list@eworm.de>
Reported-by: Gabriel C <nix.or.die@gmail.com>
Link: https://bugzilla.kernel.org/show_bug.cgi?id=198047
Fixes: 19110cfbb34d ("e1000e: Separate signaling for link check/link up")
Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Tested-by: Christian Hesse <list@eworm.de>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
[bwh: Backported to 3.2: e1000_check_for_copper_link() has a single return
 statement for success and error cases, so set ret_val in the link-up
 case instead of changing that statement.]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/net/ethernet/intel/e1000e/ich8lan.c