svn commit: r191212 - user/thompsa/vaptq/sys/dev/usb/wlan

[Andrew Thompson]

Author: thompsa
Date: Fri Apr 17 17:00:20 2009
New Revision: 191212
URL: http://svn.freebsd.org/changeset/base/191212

Log:
  Pick up the driver lock in the amrr task.

Modified:
  user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c
  user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c

Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c	Fri Apr 17 16:52:16 2009	(r191211)
+++ user/thompsa/vaptq/sys/dev/usb/wlan/if_rum.c	Fri Apr 17 17:00:20 2009	(r191212)
@@ -2213,6 +2213,7 @@ rum_amrr_task(void *arg, int pending)
 	struct ieee80211_node *ni = vap->iv_bss;
 	int ok, fail;
 
+	RUM_LOCK(sc);
 	/* read and clear statistic registers (STA_CSR0 to STA_CSR10) */
 	rum_read_multi(sc, RT2573_STA_CSR0, sc->sta, sizeof(sc->sta));
 
@@ -2227,6 +2228,7 @@ rum_amrr_task(void *arg, int pending)
 	ifp->if_oerrors += fail;	/* count TX retry-fail as Tx errors */
 
 	usb2_callout_reset(&rvp->amrr_ch, hz, rum_amrr_timeout, rvp);
+	RUM_UNLOCK(sc);
 }
 
 /* ARGUSED */

Modified: user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c	Fri Apr 17 16:52:16 2009	(r191211)
+++ user/thompsa/vaptq/sys/dev/usb/wlan/if_ural.c	Fri Apr 17 17:00:20 2009	(r191212)
@@ -2258,6 +2258,7 @@ ural_amrr_task(void *arg, int pending)
 	struct ieee80211_node *ni = vap->iv_bss;
 	int ok, fail;
 
+	RAL_LOCK(sc);
 	/* read and clear statistic registers (STA_CSR0 to STA_CSR10) */
 	ural_read_multi(sc, RAL_STA_CSR0, sc->sta, sizeof(sc->sta));
 
@@ -2272,6 +2273,7 @@ ural_amrr_task(void *arg, int pending)
 	ifp->if_oerrors += fail;	/* count TX retry-fail as Tx errors */
 
 	usb2_callout_reset(&uvp->amrr_ch, hz, ural_amrr_timeout, uvp);
+	RAL_UNLOCK(sc);
 }
 
 static int