Date: Wed, 24 Sep 2008 19:43:44 GMT From: Hans Petter Selasky <hselasky@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 150397 for review Message-ID: <200809241943.m8OJhia8010958@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=150397 Change 150397 by hselasky@hselasky_laptop001 on 2008/09/24 19:42:56 Remove temporary bugfix in the USB WLAN drivers, because this issue has now been fixed in the IEEE80211 layer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#16 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#5 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#17 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#6 edit .. //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2.c#16 (text+ko) ==== @@ -502,13 +502,6 @@ struct ieee80211com *ic; struct ifnet *ifp; -#ifdef USB_WLAN_CLONE_FIX - if (sc->sc_clone[0]) { - if (if_clone_destroy(sc->sc_clone)) { - DPRINTFN(0, "Could not destroy clone!\n"); - } - } -#endif usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); @@ -2609,15 +2602,6 @@ /* store current operation mode */ ic->ic_opmode = opmode; -#ifdef USB_WLAN_CLONE_FIX - /* - * Store a copy of the clone name so we can destroy it at - * detach! - */ - mtx_lock(&sc->sc_mtx); - snprintf(sc->sc_clone, sizeof(sc->sc_clone), "%s%u", name, unit); - mtx_unlock(&sc->sc_mtx); -#endif return (vap); } @@ -2634,9 +2618,6 @@ if (usb2_config_td_sync(&sc->sc_config_td)) { /* ignore */ } -#ifdef USB_WLAN_CLONE_FIX - sc->sc_clone[0] = 0; /* clone is gone */ -#endif mtx_unlock(&sc->sc_mtx); ieee80211_amrr_cleanup(&rvp->amrr); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_rum2_var.h#5 (text+ko) ==== @@ -169,7 +169,4 @@ int8_t sc_rssi_5ghz_corr; char sc_name[32]; -#ifdef USB_WLAN_CLONE_FIX - char sc_clone[IFNAMSIZ]; /* name of clone */ -#endif }; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#16 (text+ko) ==== @@ -495,13 +495,6 @@ struct ieee80211com *ic; struct ifnet *ifp; -#ifdef USB_WLAN_CLONE_FIX - if (sc->sc_clone[0]) { - if (if_clone_destroy(sc->sc_clone)) { - DPRINTFN(0, "Could not destroy clone!\n"); - } - } -#endif usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); @@ -2401,15 +2394,6 @@ /* store current operation mode */ ic->ic_opmode = opmode; -#ifdef USB_WLAN_CLONE_FIX - /* - * Store a copy of the clone name so we can destroy it at - * detach! - */ - mtx_lock(&sc->sc_mtx); - snprintf(sc->sc_clone, sizeof(sc->sc_clone), "%s%u", name, unit); - mtx_unlock(&sc->sc_mtx); -#endif return (vap); } @@ -2424,9 +2408,6 @@ if (usb2_config_td_sync(&sc->sc_config_td)) { /* ignore */ } -#ifdef USB_WLAN_CLONE_FIX - sc->sc_clone[0] = 0; /* clone is gone */ -#endif mtx_unlock(&sc->sc_mtx); ieee80211_amrr_cleanup(&uvp->amrr); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2_var.h#5 (text+ko) ==== @@ -158,7 +158,4 @@ uint8_t sc_myaddr[IEEE80211_ADDR_LEN]; char sc_name[32]; -#ifdef USB_WLAN_CLONE_FIX - char sc_clone[IFNAMSIZ]; /* name of clone */ -#endif }; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2.c#17 (text+ko) ==== @@ -2033,14 +2033,6 @@ struct ieee80211com *ic; struct ifnet *ifp; -#ifdef USB_WLAN_CLONE_FIX - if (sc->sc_clone[0]) { - if (if_clone_destroy(sc->sc_clone)) { - DPRINTFN(0, "Could not destroy clone!\n"); - } - } -#endif - usb2_config_td_drain(&sc->sc_config_td); mtx_lock(&sc->sc_mtx); @@ -3043,15 +3035,6 @@ ieee80211_vap_attach(vap, ieee80211_media_change, ieee80211_media_status); ic->ic_opmode = opmode; -#ifdef USB_WLAN_CLONE_FIX - /* - * Store a copy of the clone name so we can destroy it at - * detach! - */ - mtx_lock(&sc->sc_mtx); - snprintf(sc->sc_clone, sizeof(sc->sc_clone), "%s%u", name, unit); - mtx_unlock(&sc->sc_mtx); -#endif return (vap); } @@ -3066,9 +3049,6 @@ if (usb2_config_td_sync(&sc->sc_config_td)) { /* ignore */ } -#ifdef USB_WLAN_CLONE_FIX - sc->sc_clone[0] = 0; /* clone is gone */ -#endif mtx_unlock(&sc->sc_mtx); ieee80211_amrr_cleanup(&zvp->amrr); ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_zyd2_reg.h#6 (text+ko) ==== @@ -1277,7 +1277,4 @@ uint8_t sc_myaddr[IEEE80211_ADDR_LEN]; char sc_name[16]; -#ifdef USB_WLAN_CLONE_FIX - char sc_clone[IFNAMSIZ]; /* name of clone */ -#endif }; ==== //depot/projects/usb/src/sys/dev/usb2/wlan/usb2_wlan.h#5 (text+ko) ==== @@ -27,13 +27,6 @@ #ifndef _USB2_WLAN_H_ #define _USB2_WLAN_H_ -/* - * XXX: Until further the USB WLAN drivers need to destroy the clones - * themselves, because the network layer will not do this. Failing to - * destroy the clones will results in panics. - */ -#define USB_WLAN_CLONE_FIX - #include <sys/param.h> #include <sys/sockio.h> #include <sys/mbuf.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809241943.m8OJhia8010958>