From patchwork Wed Jun 30 06:48:42 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Helmut Schaa <helmut.schaa@googlemail.com>
X-Patchwork-Id: 108746
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5U6nJ4g011572
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Wed, 30 Jun 2010 06:49:20 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752478Ab0F3GtT (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Wed, 30 Jun 2010 02:49:19 -0400
Received: from mail-fx0-f46.google.com ([209.85.161.46]:46721 "EHLO
	mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752348Ab0F3GtS (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Wed, 30 Jun 2010 02:49:18 -0400
Received: by fxm14 with SMTP id 14so164401fxm.19
	for <linux-wireless@vger.kernel.org>;
	Tue, 29 Jun 2010 23:49:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
	d=googlemail.com; s=gamma;
	h=domainkey-signature:received:received:from:to:subject:date
	:user-agent:cc:mime-version:content-type:content-transfer-encoding
	:message-id; bh=mgr7yCDna/ALZhAEWDBeBWdpzNuzx8FtAd9hPk7OM68=;
	b=thJ0TI6BIDqwdRbS5UGKiFrnOL6GbPXmAsxWzpSJ8pAOn0CG7fMsbyjXFw0V9kPPi9
	Xp1nFQgUV9Ikqu2P1eP4T+Qyo4jwvcYvF6SsHUkS+R6U3LzJbs0KFvyZE5yGxK0fMTO+
	cwisU1TBucEr3sfySwHIN1te7Xnp45DTvU3BA=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma;
	h=from:to:subject:date:user-agent:cc:mime-version:content-type
	:content-transfer-encoding:message-id;
	b=JyMgd3haGI1SI813T7ZKwxradWlrl0figrKZwwCXUK76rdnGZVT7JIXJn12W+6oYub
	xUi3k0SF/kKLURu8Xuif8NTn/QGG3L/GBFaivi7RZ3Rof61UkJSzqNgDP1lr8O05C/kH
	/ufwr+qixomWRAHBqZG53+kPezMmYuJXcDqIQ=
Received: by 10.87.15.35 with SMTP id s35mr11666956fgi.12.1277880556320;
	Tue, 29 Jun 2010 23:49:16 -0700 (PDT)
Received: from helmutmobil.localnet (p5495A691.dip.t-dialin.net
	[84.149.166.145]) by mx.google.com with ESMTPS id
	c28sm4518695fka.44.2010.06.29.23.49.14
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Tue, 29 Jun 2010 23:49:15 -0700 (PDT)
From: Helmut Schaa <helmut.schaa@googlemail.com>
To: John Linville <linville@tuxdriver.com>
Subject: [PATCHv2] mac82011: Allow selection of minstrel_ht as default rc
	algorithm
Date: Wed, 30 Jun 2010 08:48:42 +0200
User-Agent: KMail/1.12.4 (Linux/2.6.35-rc3-wl-default+; KDE/4.3.5; x86_64; ;
	)
Cc: linux-wireless@vger.kernel.org, Felix Fietkau <nbd@openwrt.org>,
	"Luis R. Rodriguez" <mcgrof@gmail.com>
MIME-Version: 1.0
Message-Id: <201006300848.42201.helmut.schaa@googlemail.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
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 30 Jun 2010 06:49:20 +0000 (UTC)


diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig
index 83eec7a..4d6f865 100644
--- a/net/mac80211/Kconfig
+++ b/net/mac80211/Kconfig
@@ -69,6 +69,7 @@ endchoice
 
 config MAC80211_RC_DEFAULT
 	string
+	default "minstrel_ht" if MAC80211_RC_DEFAULT_MINSTREL && MAC80211_RC_MINSTREL_HT
 	default "minstrel" if MAC80211_RC_DEFAULT_MINSTREL
 	default "pid" if MAC80211_RC_DEFAULT_PID
 	default ""