Attachment 161553 Details for Bug 203422 – re_cfg.diff_fix

[patch] re_cfg.diff_fix

re_cfg.diff_fix (text/plain), 1.06 KB, created by Marius Strobl on 2015-09-29 23:01:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Strobl

Created: 2015-09-29 23:01:48 UTC

Size: 1.06 KB

patch

obsolete

>Index: if_re.c
>===================================================================
>--- if_re.c	(revision 288310)
>+++ if_re.c	(working copy)
>@@ -3199,6 +3199,13 @@ re_init_locked(struct rl_softc *sc)
> 		    ~0x00080000);
> 
> 	/*
>+	 * Enable transmit and receive for non-PCIe controllers.
>+	 * RX/TX MACs should be enabled before RX/TX configuration.
>+	 */
>+	if ((sc->rl_flags & RL_FLAG_PCIE) == 0)
>+		CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB | RL_CMD_RX_ENB);
>+
>+	/*
> 	 * Set the initial TX configuration.
> 	 */
> 	if (sc->rl_testmode) {
>@@ -3225,9 +3232,11 @@ re_init_locked(struct rl_softc *sc)
> 	}
> 
> 	/*
>-	 * Enable transmit and receive.
>+	 * Enable transmit and receive for PCIe controllers.
>+	 * RX/TX MACs should be enabled after RX/TX configuration.
> 	 */
>-	CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB | RL_CMD_RX_ENB);
>+	if ((sc->rl_flags & RL_FLAG_PCIE) != 0)
>+		CSR_WRITE_1(sc, RL_COMMAND, RL_CMD_TX_ENB | RL_CMD_RX_ENB);
> 
> #ifdef DEVICE_POLLING
> 	/*
>@@ -3946,7 +3955,6 @@ re_add_sysctls(struct rl_softc *sc)
> 			sc->rl_int_rx_mod = RL_TIMER_DEFAULT;
> 		}
> 	}
>-
> }
> 
> static int

Actions: View | Diff

Attachments on bug 203422: 161553