netdev - Re: [PATCH] Phonet: improve GPRS variable names

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <200812151606.10477.remi.denis-courmont@nokia.com>
Date:	Mon, 15 Dec 2008 16:06:10 +0200
From:	"Rémi Denis-Courmont" 
	<remi.denis-courmont@...ia.com>
To:	netdev@...r.kernel.org
Subject: Re: [PATCH] Phonet: improve GPRS variable names

That depends on the earlier Phonet patch in net-2.6.
I resolved the merge this way (but I could be wrong):

diff --cc drivers/net/e1000e/ich8lan.c
index 92f2ace,d115a6d..0000000
--- a/drivers/net/e1000e/ich8lan.c
+++ b/drivers/net/e1000e/ich8lan.c
@@@ -1939,7 -1893,8 +1939,8 @@@ static s32 e1000_reset_hw_ich8lan(struc
  		ctrl |= E1000_CTRL_PHY_RST;
  	}
  	ret_val = e1000_acquire_swflag_ich8lan(hw);
+ 	/* Whether or not the swflag was acquired, we need to reset the part */
 -	hw_dbg(hw, "Issuing a global reset to ich8lan");
 +	hw_dbg(hw, "Issuing a global reset to ich8lan\n");
  	ew32(CTRL, (ctrl | E1000_CTRL_RST));
  	msleep(20);
  


-- 
Rémi Denis-Courmont
Maemo Software, Nokia Devices R&D
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html