Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jul 2009 13:58:35 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r195454 - projects/mesh11s/sys/net80211
Message-ID:  <200907081358.n68DwZgP053125@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rpaulo
Date: Wed Jul  8 13:58:35 2009
New Revision: 195454
URL: http://svn.freebsd.org/changeset/base/195454

Log:
  Fix mismerge

Modified:
  projects/mesh11s/sys/net80211/ieee80211_node.c

Modified: projects/mesh11s/sys/net80211/ieee80211_node.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.c	Wed Jul  8 13:42:07 2009	(r195453)
+++ projects/mesh11s/sys/net80211/ieee80211_node.c	Wed Jul  8 13:58:35 2009	(r195454)
@@ -1114,7 +1114,6 @@ ieee80211_alloc_node(struct ieee80211_no
 	ieee80211_psq_init(&ni->ni_psq, "unknown");
 	if (vap->iv_opmode == IEEE80211_M_MBSS)
 		ieee80211_mesh_node_init(vap, ni);
-	IEEE80211_NODE_WDSQ_INIT(ni, "unknown");
 
 	IEEE80211_NODE_LOCK(nt);
 	TAILQ_INSERT_TAIL(&nt->nt_node, ni, ni_list);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200907081358.n68DwZgP053125>