2.6.36-stable review patch. If anyone has any objections, please let us know.
------------------ From: J. K. Cliburn <[email protected]> commit 2f32c867219734b06abc980d4812f67b6d6fe517 upstream. Commit 3f5a2a713aad28480d86b0add00c68484b54febc zeroes out the statistics message block (SMB) and coalescing message block (CMB) when adapter ring resources are freed. This is desirable behavior, but, as a side effect, the commit leads to an oops when atl1_set_ringparam() attempts to alter the number of rx or tx elements in the ring buffer (by using ethtool -G, for example). We don't want SMB or CMB to change during this operation. Modify atl1_set_ringparam() to preserve SMB and CMB when changing ring parameters. Signed-off-by: Jay Cliburn <[email protected]> Reported-by: Tõnu Raitviir <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/net/atlx/atl1.c | 10 ++++++++++ 1 file changed, 10 insertions(+) --- a/drivers/net/atlx/atl1.c +++ b/drivers/net/atlx/atl1.c @@ -3503,6 +3503,8 @@ static int atl1_set_ringparam(struct net struct atl1_rfd_ring rfd_old, rfd_new; struct atl1_rrd_ring rrd_old, rrd_new; struct atl1_ring_header rhdr_old, rhdr_new; + struct atl1_smb smb; + struct atl1_cmb cmb; int err; tpd_old = adapter->tpd_ring; @@ -3543,11 +3545,19 @@ static int atl1_set_ringparam(struct net adapter->rrd_ring = rrd_old; adapter->tpd_ring = tpd_old; adapter->ring_header = rhdr_old; + /* + * Save SMB and CMB, since atl1_free_ring_resources + * will clear them. + */ + smb = adapter->smb; + cmb = adapter->cmb; atl1_free_ring_resources(adapter); adapter->rfd_ring = rfd_new; adapter->rrd_ring = rrd_new; adapter->tpd_ring = tpd_new; adapter->ring_header = rhdr_new; + adapter->smb = smb; + adapter->cmb = cmb; err = atl1_up(adapter); if (err)
_______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
