Attachment #154011 for bug #197143

View | Details | Raw Unified | Return to bug 197143 | Differences between

and this patch




static void
wpi_update_beacon(struct ieee80211vap *vap, int item)
{
	struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
	struct ieee80211_node *ni = vap->iv_bss;
	struct ifnet *ifp = vap->iv_ifp;
	struct wpi_softc *sc = ifp->if_softc;
	int error;

	WPI_LOCK(sc);

wpi_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k,
    ieee80211_keyix *keyix, ieee80211_keyix *rxkeyix)
{
	struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
	struct wpi_softc *sc = ifp->if_softc;

	if (!(&vap->iv_nw_keys[0] <= k &&
	    k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) {

Return to bug 197143

Lines 3850-3858 Link Here

(-)sys/dev/wpi/if_wpi.c (-4 / +2 lines)
3850	static void	3850	static void
3851	wpi_update_beacon(struct ieee80211vap *vap, int item)	3851	wpi_update_beacon(struct ieee80211vap *vap, int item)
3852	{	3852	{
		3853	struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
3853	struct ieee80211_node *ni = vap->iv_bss;	3854	struct ieee80211_node *ni = vap->iv_bss;
3854	struct ifnet *ifp = vap->iv_ifp;
3855	struct wpi_softc *sc = ifp->if_softc;
3856	int error;	3855	int error;
3857		3856
3858	WPI_LOCK(sc);	3857	WPI_LOCK(sc);
Lines 3970-3977 Link Here
3970	wpi_key_alloc(struct ieee80211vap vap, struct ieee80211_key k,	3969	wpi_key_alloc(struct ieee80211vap vap, struct ieee80211_key k,
3971	ieee80211_keyix keyix, ieee80211_keyix rxkeyix)	3970	ieee80211_keyix keyix, ieee80211_keyix rxkeyix)
3972	{	3971	{
3973	struct ifnet *ifp = vap->iv_ifp;	3972	struct wpi_softc *sc = vap->iv_ic->ic_ifp->if_softc;
3974	struct wpi_softc *sc = ifp->if_softc;
3975		3973
3976	if (!(&vap->iv_nw_keys[0] <= k &&	3974	if (!(&vap->iv_nw_keys[0] <= k &&
3977	k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) {	3975	k < &vap->iv_nw_keys[IEEE80211_WEP_NKID])) {