From owner-p4-projects@FreeBSD.ORG  Sun Dec  2 22:36:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 88D4216A421; Sun,  2 Dec 2007 22:36:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E7B2A16A41A
	for <perforce@FreeBSD.org>; Sun,  2 Dec 2007 22:36:54 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D9A7213C46A
	for <perforce@FreeBSD.org>; Sun,  2 Dec 2007 22:36:54 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lB2Mas7P000848
	for <perforce@FreeBSD.org>; Sun, 2 Dec 2007 22:36:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lB2MasBK000845
	for perforce@freebsd.org; Sun, 2 Dec 2007 22:36:54 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 2 Dec 2007 22:36:54 GMT
Message-Id: <200712022236.lB2MasBK000845@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 130056 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Dec 2007 22:36:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=130056

Change 130056 by hselasky@hselasky_laptop001 on 2007/12/02 22:35:58

	
	Update "if_rum.c" according to "if_ural.c"
	in change 130054 .

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#18 (text+ko) ====

@@ -1320,6 +1320,8 @@
 	uint32_t temp_len;
 	uint8_t align;
 
+	ic->ic_lastdata = ticks;
+
 	if (m->m_pkthdr.len > MCLBYTES) {
 		DPRINTF(sc, 0, "data overflow, %u bytes\n",
 		    m->m_pkthdr.len);
@@ -1425,6 +1427,17 @@
 
 			wh = mtod(m, struct ieee80211_frame *);
 
+			if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
+				k = ieee80211_crypto_encap(ic, ni, m);
+				if (k == NULL) {
+					goto error;
+				}
+				/*
+				 * packet header may have moved, reset our
+				 * local pointer
+				 */
+				wh = mtod(m, struct ieee80211_frame *);
+			}
 			if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 
 				flags |= RT2573_TX_NEED_ACK;
@@ -1455,6 +1468,12 @@
 
 		if (m) {
 
+			/*
+		         * Cancel any background scan.
+		         */
+			if (ic->ic_flags & IEEE80211_F_SCAN) {
+				ieee80211_cancel_scan(ic);
+			}
 			if (m->m_len < sizeof(struct ether_header)) {
 				m = m_pullup(m, sizeof(struct ether_header));
 
@@ -2677,7 +2696,6 @@
     struct rum_config_copy *cc, uint16_t refcount)
 {
 	struct rum_tx_desc desc;
-	struct ieee80211com *ic = &(sc->sc_ic);
 	struct ieee80211_node *ni = sc->sc_ic.ic_bss;
 	struct mbuf *m;
 	uint16_t rate;
@@ -2685,7 +2703,7 @@
 	if ((sc->sc_flags & RUM_FLAG_LL_READY) &&
 	    (sc->sc_flags & RUM_FLAG_HL_READY)) {
 
-		m = ieee80211_beacon_alloc(ic, ic->ic_bss, &sc->sc_bo);
+		m = ieee80211_beacon_alloc(ni, &sc->sc_bo);
 		if (m == NULL) {
 			return;
 		}