Author: monthadar
Date: Thu Feb 7 21:29:14 2013
New Revision: 246515
URL: http://svnweb.freebsd.org/changeset/base/246515
Log:
Mesh HWMP PREQ: fixed conditions for discarding elements.
Approved by: adrian (mentor)
Modified:
head/sys/net80211/ieee80211_hwmp.c
Modified: head/sys/net80211/ieee80211_hwmp.c
==============================================================================
--- head/sys/net80211/ieee80211_hwmp.c Thu Feb 7 21:28:25 2013
(r246514)
+++ head/sys/net80211/ieee80211_hwmp.c Thu Feb 7 21:29:14 2013
(r246515)
@@ -997,10 +997,10 @@ hwmp_recv_preq(struct ieee80211vap *vap,
* it will be marked below.
*/
rtorig->rt_flags = IEEE80211_MESHRT_FLAGS_VALID;
- }else if ((hrtarg != NULL &&
- HWMP_SEQ_EQ(hrtarg->hr_seq, PREQ_TSEQ(0)) &&
- ((rtorig->rt_flags & IEEE80211_MESHRT_FLAGS_VALID) == 0)) ||
- preqid >= preq->preq_id) {
+ } else if ((hrtarg != NULL &&
+ !HWMP_SEQ_EQ(hrtarg->hr_seq, PREQ_TSEQ(0))) ||
+ (rtorig->rt_flags & IEEE80211_MESHRT_FLAGS_VALID &&
+ preqid >= preq->preq_id)) {
IEEE80211_NOTE(vap, IEEE80211_MSG_HWMP, ni,
"discard PREQ from %6D, old seqno %u <= %u,"
" or old preqid %u < %u",
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
