svn commit: r220087 - stable/8/sys/dev/usb/wlan

[Kevin Lo]

Author: kevlo
Date: Mon Mar 28 01:24:20 2011
New Revision: 220087
URL: http://svn.freebsd.org/changeset/base/220087

Log:
  MFC r219982:
  Fix panic while associating access point.
  While here, add the SMC SMCWUSB-G

Modified:
  stable/8/sys/dev/usb/wlan/if_zyd.c

Modified: stable/8/sys/dev/usb/wlan/if_zyd.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_zyd.c	Mon Mar 28 00:19:01 2011	(r220086)
+++ stable/8/sys/dev/usb/wlan/if_zyd.c	Mon Mar 28 01:24:20 2011	(r220087)
@@ -229,6 +229,7 @@ static const struct usb_device_id zyd_de
 	ZYD_ZD1211_DEV(ZYXEL, ZYAIRG220),
 	ZYD_ZD1211_DEV(ZYXEL, G200V2),
 	/* ZYD_ZD1211B */
+	ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG_NF),
 	ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG),
 	ZYD_ZD1211B_DEV(ACCTON, ZD1211B),
 	ZYD_ZD1211B_DEV(ASUS, A9T_WIFI),
@@ -510,9 +511,6 @@ zyd_tx_free(struct zyd_tx_data *data, in
 		m_freem(data->m);
 		data->m = NULL;
 
-		if (txerr == 0)
-			ieee80211_ratectl_tx_complete(data->ni->ni_vap,
-			    data->ni, IEEE80211_RATECTL_TX_SUCCESS, NULL, NULL);
 		ieee80211_free_node(data->ni);
 		data->ni = NULL;
 	}