From patchwork Mon Nov  9 23:46:52 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rui Paulo <rpaulo@gmail.com>
X-Patchwork-Id: 58900
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA9NldR1015240
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Mon, 9 Nov 2009 23:47:40 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755745AbZKIXrd (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Mon, 9 Nov 2009 18:47:33 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755744AbZKIXrd
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Mon, 9 Nov 2009 18:47:33 -0500
Received: from mail-ew0-f207.google.com ([209.85.219.207]:46271 "EHLO
	mail-ew0-f207.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755738AbZKIXrc (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Mon, 9 Nov 2009 18:47:32 -0500
Received: by ewy3 with SMTP id 3so3717715ewy.37
	for <linux-wireless@vger.kernel.org>;
	Mon, 09 Nov 2009 15:47:37 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:cc:subject:date
	:message-id:x-mailer:in-reply-to:references;
	bh=F+lD80HcInmlssHjPpqL1Krg4jf4KkOFf53ka3Auso8=;
	b=LhHGFYJIlJ/ymYhcVry8Ybyhmd30K3O9xrr/lilOpfaIg2x9SW7gAL0Dz5KyYv08K3
	gJeLvMJSVqJ4YOK/EMYd4Lj6ua5YuoyIIwJy8bDTckUCJgN2QsI2gGuqPzLSkz/5J8gX
	pUbtUSTfv9B9iOBlqk3AokXoQ3eqax96uvRck=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
	b=i4JEe6IpqGunQMTIPVRxAHbNgHbZ/0hdAH/mou3CX/0WcJ48yQuXEu23ewb3H3EwUo
	lPPnDMX+jlwc9p9SK5yEORbWJh+EJmgR7ji2gc1jHkMdjZM7KIHy9c4/pZOCrTuw+4im
	0IJ+uDx/wYCnmPFLj1WY2jUZj1Cv1X2TR4kmo=
Received: by 10.213.100.18 with SMTP id w18mr1905843ebn.60.1257810456999;
	Mon, 09 Nov 2009 15:47:36 -0800 (PST)
Received: from localhost (bl5-227-167.dsl.telepac.pt [82.154.227.167])
	by mx.google.com with ESMTPS id 7sm449350eyb.16.2009.11.09.15.47.36
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Mon, 09 Nov 2009 15:47:36 -0800 (PST)
From: Rui Paulo <rpaulo@gmail.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org, Johannes Berg <johannes@sipsolutions.net>,
	Rui Paulo <rpaulo@gmail.com>, Javier Cardona <javier@cozybit.com>
Subject: [PATCH v2 14/20] mac80211: set the AID field correctly for mesh
	peer frames
Date: Mon,  9 Nov 2009 23:46:52 +0000
Message-Id: <1257810418-30075-15-git-send-email-rpaulo@gmail.com>
X-Mailer: git-send-email 1.5.6.5
In-Reply-To: <1257810418-30075-1-git-send-email-rpaulo@gmail.com>
References: <1257810418-30075-1-git-send-email-rpaulo@gmail.com>
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index cf12f61..ec68d20 100644
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -181,7 +181,8 @@ static int mesh_plink_frame_tx(struct ieee80211_sub_if_data *sdata,
 		if (action == PLINK_CONFIRM) {
 			pos = skb_put(skb, 4);
 			/* two-byte status code followed by two-byte AID */
-			memset(pos, 0, 4);
+			memset(pos, 0, 2);
+			memcpy(pos + 2, &plid, 2);
 		}
 		mesh_mgmt_ies_add(skb, sdata);
 	}