From patchwork Fri Mar 4 12:31:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Helmut Schaa X-Patchwork-Id: 609091 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p24CVmmQ028296 for ; Fri, 4 Mar 2011 12:31:51 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752131Ab1CDMbr (ORCPT ); Fri, 4 Mar 2011 07:31:47 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:44382 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751999Ab1CDMbq (ORCPT ); Fri, 4 Mar 2011 07:31:46 -0500 Received: by bwz15 with SMTP id 15so2003024bwz.19 for ; Fri, 04 Mar 2011 04:31:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=DUdRygWnhpPimR6fwlwJ2mxzzLXoP8AHA9b7zlc1S/s=; b=FI2GVvDZzFIq5CMvLD/zK9c4CijOyVl9xxEsv4h46RPzJqWMBQuCDo0XvD3NkSL7rl BL75XOZb52XSEzvBhoFUQ7jdb/BHZeK0BsItOcC+4LhEuxPpcPjMg1TYsmr33XLBKtCa Y811Yu1eUKIx/50djWDdxgQpDj0dhi+efJ7uc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=YQEIrCIUj3LuM+5gzeyJZ8lbEnxncA5+3uvUwkz6mXFKWHltbnNJ45tgLRxwwQw3KM VPv3G4GmmA745YgXtpe2i3uesEqYOeGE+zA5RJDRwUl+f8M0FwDs4CYADoxmSvlX6NN5 dcReNH7sdpkxKVTWio0keru4cOBHYAfbdUKfE= Received: by 10.204.233.15 with SMTP id jw15mr515295bkb.48.1299241905110; Fri, 04 Mar 2011 04:31:45 -0800 (PST) Received: from localhost.localdomain (p5495ACF2.dip.t-dialin.net [84.149.172.242]) by mx.google.com with ESMTPS id l1sm377141bkl.13.2011.03.04.04.31.42 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 04 Mar 2011 04:31:44 -0800 (PST) From: Helmut Schaa To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, johannes@sipsolutions.net, nbd@openwrt.org, Helmut Schaa Subject: [PATCH 1/2] mac80211: Remove redundant preamble and RTS flag setup in minstrel_ht Date: Fri, 4 Mar 2011 13:31:31 +0100 Message-Id: <1299241892-6719-1-git-send-email-helmut.schaa@googlemail.com> X-Mailer: git-send-email 1.7.1 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 04 Mar 2011 12:31:56 +0000 (UTC) diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 165a451..775cf15 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -519,9 +519,7 @@ minstrel_ht_set_rate(struct minstrel_priv *mp, struct minstrel_ht_sta *mi, rate->count = mr->retry_count; rate->flags = IEEE80211_TX_RC_MCS | group->flags; - if (txrc->short_preamble) - rate->flags |= IEEE80211_TX_RC_USE_SHORT_PREAMBLE; - if (txrc->rts || rtscts) + if (rtscts) rate->flags |= IEEE80211_TX_RC_USE_RTS_CTS; rate->idx = index % MCS_GROUP_RATES + (group->streams - 1) * MCS_GROUP_RATES; }