PERFORCE change 184689 for review

[Hans Petter Selasky]

http://p4web.freebsd.org/@@184689?ac=10

Change 184689 by hselasky at hselasky_laptop001 on 2010/10/13 21:40:07

	
	IFC

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#28 integrate
.. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#20 integrate

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#28 (text+ko) ====

@@ -696,7 +696,6 @@
 		ieee80211_state_name[nstate]);
 
 	IEEE80211_UNLOCK(ic);
-
 	RAL_LOCK(sc);
 	usb_callout_stop(&uvp->ratectl_ch);
 
@@ -728,18 +727,18 @@
 			if (m == NULL) {
 				device_printf(sc->sc_dev,
 				    "could not allocate beacon\n");
-				ieee80211_free_node(ni);
 				RAL_UNLOCK(sc);
 				IEEE80211_LOCK(ic);
+				ieee80211_free_node(ni);
 				return (-1);
 			}
 			ieee80211_ref_node(ni);
 			if (ural_tx_bcn(sc, m, ni) != 0) {
 				device_printf(sc->sc_dev,
 				    "could not send beacon\n");
-				ieee80211_free_node(ni);
 				RAL_UNLOCK(sc);
 				IEEE80211_LOCK(ic);
+				ieee80211_free_node(ni);
 				return (-1);
 			}
 		}
@@ -2255,10 +2254,8 @@
 	sum = ok+fail;
 	retrycnt = sc->sta[8] + fail;
 
-	ni = ieee80211_ref_node(vap->iv_bss);
 	ieee80211_ratectl_tx_update(vap, ni, &sum, &ok, &retrycnt);
 	(void) ieee80211_ratectl_rate(ni, NULL, 0);
-	ieee80211_free_node(ni);
 
 	ifp->if_oerrors += fail;	/* count TX retry-fail as Tx errors */
 

==== //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#20 (text+ko) ====

@@ -1843,7 +1843,6 @@
 	sc->sc_state = nstate;
 
 	IEEE80211_UNLOCK(ic);
-
 	URTW_LOCK(sc);
 	usb_callout_stop(&sc->sc_led_ch);
 	callout_stop(&sc->sc_watchdog_ch);
@@ -1856,7 +1855,6 @@
 		break;
 	case IEEE80211_S_RUN:
 		ni = ieee80211_ref_node(vap->iv_bss);
-
 		/* setting bssid.  */
 		urtw_write32_m(sc, URTW_BSSID, ((uint32_t *)ni->ni_bssid)[0]);
 		urtw_write16_m(sc, URTW_BSSID + 4,
@@ -1871,7 +1869,6 @@
 		if (error != 0)
 			device_printf(sc->sc_dev,
 			    "could not control LED (%d)\n", error);
-
 		ieee80211_free_node(ni);
 		break;
 	default: