Date: Wed, 1 Jul 2009 01:31:14 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r195224 - projects/mesh11s/sys/net80211 Message-ID: <200907010131.n611VEu2097722@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Wed Jul 1 01:31:14 2009 New Revision: 195224 URL: http://svn.freebsd.org/changeset/base/195224 Log: move debug msg for drop due to mesh seq# and make it consistent Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c projects/mesh11s/sys/net80211/ieee80211_mesh.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed Jul 1 01:29:06 2009 (r195223) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed Jul 1 01:31:14 2009 (r195224) @@ -1175,9 +1175,6 @@ ieee80211_hwmp_checkpseq(struct ieee8021 return 0; } if (IEEE80211_MESH_SEQ_GEQ(rt->rt_lastpseq, seq)) { - IEEE80211_NOTE(vap, IEEE80211_MSG_MESH, - vap->iv_bss, "seqno %u <= seqno %u", seq, - rt->rt_lastpseq); return 1; } else { rt->rt_lastpseq = seq; Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed Jul 1 01:29:06 2009 (r195223) +++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Wed Jul 1 01:31:14 2009 (r195224) @@ -545,8 +545,13 @@ mesh_input(struct ieee80211_node *ni, st addr = ((struct ieee80211_qosframe_addr4 *)wh)->i_addr4; if (IEEE80211_ADDR_EQ(vap->iv_myaddr, addr)) goto out; - if (ieee80211_hwmp_checkpseq(vap, addr, seq)) + if (ieee80211_hwmp_checkpseq(vap, addr, seq) != 0) { + IEEE80211_DISCARD_MAC(vap, IEEE80211_MSG_MESH, + addr, "data", "duplicate mesh seqno %u ttl %u", + seq, mc->mc_ttl); + vap->iv_stats.is_rx_dup++; goto out; + } /* * Forward and deliver multicast packets */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907010131.n611VEu2097722>