From owner-p4-projects@FreeBSD.ORG Wed Jan 19 18:47:59 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 28B9716A4D1; Wed, 19 Jan 2005 18:47:59 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id F3B5D16A4CE for ; Wed, 19 Jan 2005 18:47:58 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C90A43D49 for ; Wed, 19 Jan 2005 18:47:58 +0000 (GMT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0JIlw8G074071 for ; Wed, 19 Jan 2005 18:47:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0JIlwaY074068 for perforce@freebsd.org; Wed, 19 Jan 2005 18:47:58 GMT (envelope-from sam@freebsd.org) Date: Wed, 19 Jan 2005 18:47:58 GMT Message-Id: <200501191847.j0JIlwaY074068@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 69311 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Jan 2005 18:47:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=69311 Change 69311 by sam@sam_ebb on 2005/01/19 18:47:44 fix mismerge Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#41 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#41 (text+ko) ==== @@ -235,7 +235,7 @@ * Fake up a node for this newly * discovered member of the IBSS. */ - ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, type == IEEE80211_FC0_TYPE_CTL ? wh->i_addr1 : wh->i_addr2); if (ni == NULL) { @@ -349,7 +349,7 @@ IEEE80211_DISCARD(ic, IEEE80211_MSG_INPUT, wh, "data", "%s", "unknown src"); /* NB: caller deals with reference */ - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH, @@ -507,7 +507,7 @@ /* XXX this dups work done in ieee80211_encap */ /* check if destination is associated */ struct ieee80211_node *ni1 = - ieee80211_find_node(ic->ic_sta, + ieee80211_find_node(&ic->ic_sta, eh->ether_dhost); if (ni1 != NULL) { /* XXX check if authorized */ @@ -873,7 +873,7 @@ } /* always accept open authentication requests */ if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni == NULL) return; } else @@ -1020,7 +1020,7 @@ switch (seq) { case IEEE80211_AUTH_SHARED_REQUEST: if (ni == ic->ic_bss) { - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni == NULL) { /* NB: no way to return an error */ return; @@ -1890,7 +1890,7 @@ if ((ic->ic_flags & IEEE80211_F_SCAN) == 0) { if ((capinfo & IEEE80211_CAPINFO_IBSS) == 0) return; - ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, wh->i_addr2); } else ni = ieee80211_dup_bss(&ic->ic_scan, wh->i_addr2); @@ -1995,10 +1995,10 @@ * send the response so blindly add them to the * neighbor table. */ - ni = ieee80211_fakeup_adhoc_node(ic->ic_sta, + ni = ieee80211_fakeup_adhoc_node(&ic->ic_sta, wh->i_addr2); } else - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni == NULL) return; allocbs = 1; @@ -2164,7 +2164,7 @@ "[%s] deny %s request, sta not authenticated\n", ether_sprintf(wh->i_addr2), reassoc ? "reassoc" : "assoc"); - ni = ieee80211_dup_bss(ic->ic_sta, wh->i_addr2); + ni = ieee80211_dup_bss(&ic->ic_sta, wh->i_addr2); if (ni != NULL) { IEEE80211_SEND_MGMT(ic, ni, IEEE80211_FC0_SUBTYPE_DEAUTH,