From 58a0aabae3d51dcd4f47a1ac06936b921f23c538 Mon Sep 17 00:00:00 2001 From: "J. K. Cliburn" Date: Sat, 1 Jan 2011 05:02:12 +0000 Subject: [PATCH] --- yaml --- r: 223767 b: refs/heads/master c: 2f32c867219734b06abc980d4812f67b6d6fe517 h: refs/heads/master i: 223765: da2c83559250fcc2321f11018198b4ea031da9a7 223763: 9df11bc2364d0f92c52257b80ff025a82018a09e 223759: 6a6b25130689f3ee5af8511f452116e3b807e3cd v: v3 --- [refs] | 2 +- trunk/drivers/net/atlx/atl1.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a15d765e0edf..9ecb62b5cc5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9556f9a1abdc56a179ac7ba6053469373b6de0f +refs/heads/master: 2f32c867219734b06abc980d4812f67b6d6fe517 diff --git a/trunk/drivers/net/atlx/atl1.c b/trunk/drivers/net/atlx/atl1.c index 53363108994e..3acf5123a6ef 100644 --- a/trunk/drivers/net/atlx/atl1.c +++ b/trunk/drivers/net/atlx/atl1.c @@ -3504,6 +3504,8 @@ static int atl1_set_ringparam(struct net_device *netdev, 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; @@ -3544,11 +3546,19 @@ static int atl1_set_ringparam(struct net_device *netdev, 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)