From owner-svn-src-projects@FreeBSD.ORG Fri Jun 19 23:30:10 2009 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 489A1106566C; Fri, 19 Jun 2009 23:30:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 36D828FC12; Fri, 19 Jun 2009 23:30:10 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5JNUAwM058375; Fri, 19 Jun 2009 23:30:10 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5JNUAFO058373; Fri, 19 Jun 2009 23:30:10 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906192330.n5JNUAFO058373@svn.freebsd.org> From: Rui Paulo Date: Fri, 19 Jun 2009 23:30:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r194520 - projects/mesh11s/sys/net80211 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2009 23:30:10 -0000 Author: rpaulo Date: Fri Jun 19 23:30:09 2009 New Revision: 194520 URL: http://svn.freebsd.org/changeset/base/194520 Log: * Don't forward locally generated frames. * Bump the refcnt before xmit. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jun 19 23:28:26 2009 (r194519) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Fri Jun 19 23:30:09 2009 (r194520) @@ -388,12 +388,12 @@ mesh_input(struct ieee80211_node *ni, st ((struct ieee80211_qosframe *)wh)->i_qos[0]; } else qos = 0; - /* - * Broadcast multicast packets. We just decrement the TTL and - * set addr2 to our MAC address. + * Forward multicast packets. We just decrement the TTL and + * set TA to our MAC address. */ if (IEEE80211_IS_MULTICAST(wh->i_addr1) && mc->mc_ttl > 0 && + !IEEE80211_ADDR_EQ(vap->iv_myaddr, wh->i_addr3) && (vap->iv_meshflags & IEEE80211_MFLAGS_FWRD)) { struct mbuf *mcopy; struct ieee80211_meshcntl *mccopy; @@ -434,6 +434,12 @@ mesh_input(struct ieee80211_node *ni, st params.ibp_rate0 = tp->mgmtrate; params.ibp_flags |= IEEE80211_BPF_NOACK; params.ibp_try0 = 1; + IEEE80211_DPRINTF(vap, IEEE80211_MSG_NODE, + "ieee80211_ref_node (%s:%u) %p<%s> refcnt %d\n", + __func__, __LINE__, + ni, ether_sprintf(ni->ni_macaddr), + ieee80211_node_refcnt(ni)+1); + ieee80211_ref_node(vap->iv_bss); err = ic->ic_raw_xmit(vap->iv_bss, mcopy, ¶ms); if (err) { /* NB: IFQ_HANDOFF reclaims mbuf */