From owner-svn-src-projects@FreeBSD.ORG Wed Jun 10 10:53:14 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 AA8211065764; Wed, 10 Jun 2009 10:53:14 +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 7E8D88FC27; Wed, 10 Jun 2009 10:53:14 +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 n5AArEAi010767; Wed, 10 Jun 2009 10:53:14 GMT (envelope-from rpaulo@svn.freebsd.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5AArEo7010766; Wed, 10 Jun 2009 10:53:14 GMT (envelope-from rpaulo@svn.freebsd.org) Message-Id: <200906101053.n5AArEo7010766@svn.freebsd.org> From: Rui Paulo Date: Wed, 10 Jun 2009 10:53:14 +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: r193898 - 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: Wed, 10 Jun 2009 10:53:15 -0000 Author: rpaulo Date: Wed Jun 10 10:53:14 2009 New Revision: 193898 URL: http://svn.freebsd.org/changeset/base/193898 Log: Simplify code. No functional change. Sponsored by: The FreeBSD Foundation Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c Modified: projects/mesh11s/sys/net80211/ieee80211_hwmp.c ============================================================================== --- projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed Jun 10 10:51:38 2009 (r193897) +++ projects/mesh11s/sys/net80211/ieee80211_hwmp.c Wed Jun 10 10:53:14 2009 (r193898) @@ -872,7 +872,6 @@ ieee80211_hwmp_discover(struct ieee80211 { struct ieee80211_hwmp_state *hs = vap->iv_hwmp; struct ieee80211_hwmp_fi *fi = NULL; - static const uint8_t invalidaddr[] = { 0, 0, 0, 0, 0, 0 }; struct ieee80211_meshpreq_ie preq; int sendpreq = 0, unknowndst = 0; @@ -887,12 +886,11 @@ ieee80211_hwmp_discover(struct ieee80211 mtx_lock(&hs->hs_lock); TAILQ_FOREACH(fi, &hs->hs_head, fi_next) { - if (IEEE80211_ADDR_EQ(fi->fi_dest, dest)) { - if (IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) { - /* XXX check preq retries */ - sendpreq = 1; - unknowndst = 1; - } + if (IEEE80211_ADDR_EQ(fi->fi_dest, dest) && + IEEE80211_ADDR_EQ(fi->fi_nexthop, invalidaddr)) { + /* XXX check preq retries */ + sendpreq = 1; + unknowndst = 1; break; } } @@ -901,7 +899,7 @@ ieee80211_hwmp_discover(struct ieee80211 if (fi == NULL) { fi = malloc(sizeof(struct ieee80211_hwmp_fi), M_80211_VAP, M_NOWAIT | M_ZERO); - memcpy(fi->fi_dest, dest, IEEE80211_ADDR_LEN); + IEEE80211_ADDR_COPY(fi->fi_dest, dest); fi->fi_seq = ++hs->hs_seq; fi->fi_metric = IEEE80211_MESHLMETRIC_INITIALVAL; fi->fi_lifetime = ieee80211_hwmp_pathtimeout; @@ -946,7 +944,6 @@ ieee80211_hwmp_discover(struct ieee80211 #undef PREQ_TADDR #undef PREQ_TSEQ - static int hwmp_ioctl_get80211(struct ieee80211vap *vap, struct ieee80211req *ireq) { @@ -955,7 +952,7 @@ hwmp_ioctl_get80211(struct ieee80211vap struct ieee80211_hwmp_state *hs; struct ieee80211_hwmp_fi *fi; uint8_t *p; - + if (vap->iv_opmode != IEEE80211_M_MBSS) return EINVAL; error = 0;