From owner-svn-src-user@FreeBSD.ORG  Sat Mar  9 14:34:54 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 79ED8F1E;
 Sat,  9 Mar 2013 14:34:54 +0000 (UTC)
 (envelope-from attilio@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 6CE0E64A;
 Sat,  9 Mar 2013 14:34:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r29EYsFO087613;
 Sat, 9 Mar 2013 14:34:54 GMT (envelope-from attilio@svn.freebsd.org)
Received: (from attilio@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r29EYsFf087612;
 Sat, 9 Mar 2013 14:34:54 GMT (envelope-from attilio@svn.freebsd.org)
Message-Id: <201303091434.r29EYsFf087612@svn.freebsd.org>
From: Attilio Rao <attilio@FreeBSD.org>
Date: Sat, 9 Mar 2013 14:34:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r248103 - user/attilio/vmc-playground/sys/net80211
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 09 Mar 2013 14:34:54 -0000

Author: attilio
Date: Sat Mar  9 14:34:53 2013
New Revision: 248103
URL: http://svnweb.freebsd.org/changeset/base/248103

Log:
  Fix mismerge.

Modified:
  user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c

Modified: user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c
==============================================================================
--- user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c	Sat Mar  9 13:30:06 2013	(r248102)
+++ user/attilio/vmc-playground/sys/net80211/ieee80211_mesh.c	Sat Mar  9 14:34:53 2013	(r248103)
@@ -1477,7 +1477,6 @@ mesh_recv_indiv_data_to_fwrd(struct ieee
 	struct ieee80211_qosframe_addr4 *qwh;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt_meshda, *rt_meshsa;
-	struct ieee80211com *ic = vap->iv_ic;
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);
@@ -1536,7 +1535,6 @@ mesh_recv_indiv_data_to_me(struct ieee80
 	const struct ieee80211_meshcntl_ae10 *mc10;
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
 	struct ieee80211_mesh_route *rt;
-	struct ieee80211com *ic = vap->iv_ic;
 	int ae;
 
 	/* This is called from the RX path - don't hold this lock */
@@ -1603,7 +1601,6 @@ mesh_recv_group_data(struct ieee80211vap
 {
 #define	MC01(mc)	((const struct ieee80211_meshcntl_ae01 *)mc)
 	struct ieee80211_mesh_state *ms = vap->iv_mesh;
-	struct ieee80211com *ic = vap->iv_ic;
 
 	/* This is called from the RX path - don't hold this lock */
 	IEEE80211_TX_UNLOCK_ASSERT(vap->iv_ic);