[TULIP] DMFE: Fix SROM parsing regression. (4c93566e) · Commits · 戴 / test

Changeset (dmfe warning fix) bothed up the offsets read from the SROM so that it doesn't read the same datums it used to. The change made transformations like turning: "srom + 34" into "(__le32 *)srom + 34/4" which doesn't work because 4 does not divide evenly into 34 so we're using a different pointer offset than in the original code. I've changed theses cases in dmfe_parse_srom() to consistently use "(type *)(srom + offset)" preserving the offsets from the original code. Signed-off-by:

David S. Miller <davem@davemloft.net>

drivers/net/tulip/dmfe.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -1909,7 +1909,7 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
		if ( ( (int) srom[18] & 0xff) == SROM_V41_CODE) {
		/* SROM V4.01 */
		/* Get NIC support media mode */
		db->NIC_capability = le16_to_cpup((__le16 *)srom + 34/2);
		db->NIC_capability = le16_to_cpup((__le16 *) (srom + 34));
		db->PHY_reg4 = 0;
		for (tmp_reg = 1; tmp_reg < 0x10; tmp_reg <<= 1) {
		switch( db->NIC_capability & tmp_reg ) {
		@@ -1921,8 +1921,8 @@ static void dmfe_parse_srom(struct dmfe_board_info * db)
		}

		/* Media Mode Force or not check */
		dmfe_mode = le32_to_cpup((__le32 *)srom + 34/4) &
		le32_to_cpup((__le32 *)srom + 36/4);
		dmfe_mode = (le32_to_cpup((__le32 *) (srom + 34)) &
		le32_to_cpup((__le32 *) (srom + 36)));
		switch(dmfe_mode) {
		case 0x4: dmfe_media_mode = DMFE_100MHF; break; /* 100MHF */
		case 0x2: dmfe_media_mode = DMFE_10MFD; break; /* 10MFD */

Admin message