From patchwork Wed Dec 2 14:26:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Holger Schurig X-Patchwork-Id: 64285 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 nB2EUTHU007999 for ; Wed, 2 Dec 2009 14:30:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754674AbZLBOaU (ORCPT ); Wed, 2 Dec 2009 09:30:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754669AbZLBOaU (ORCPT ); Wed, 2 Dec 2009 09:30:20 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:65310 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754660AbZLBOaT (ORCPT ); Wed, 2 Dec 2009 09:30:19 -0500 Received: by mail-bw0-f227.google.com with SMTP id 27so217224bwz.21 for ; Wed, 02 Dec 2009 06:30:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:message-id :references:user-agent:date:from:to:subject:content-disposition; bh=fgBwAr7M1ocv7az5wW8wKOZHcDHk1A4LiXZp8A9FBvE=; b=W/pQTFvzUABxSUxRosGRyV8MvoQS2aI5zSaRhajhiYRIHC6mAmCgRbVBCx35yTaS/r jTAbJ2p0/PCgXLOqBEChJWV0k20jLvbYRJg4j+AJ8iSGosRkU4oiKyb2KodTdvWwl6f2 67id8YxyTE1CxbxDLFwDidQ1zc7tSdrNNPJU8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=message-id:references:user-agent:date:from:to:subject :content-disposition; b=jmM+vJYLl4FlsOwOhxydYjmrfreKwt2Vp5sz0LYrzCMvCpnaU1pRPD8jJvSY3m8jje R7x2CQu12FdEWmIf9y+e+9pkmKYzuKiA6GkWe86bD1+j0t72bkCdwZO/OoWYYcikxVhk 62AtKXgSHwYcSJxf0GeyK/ZBNxoUVMq5hRNU4= Received: by 10.204.34.3 with SMTP id j3mr228382bkd.23.1259764225228; Wed, 02 Dec 2009 06:30:25 -0800 (PST) Received: from holgerschurig@gmail.com (pD95FA93E.dip0.t-ipconnect.de [217.95.169.62]) by mx.google.com with ESMTPS id 14sm334295bwz.5.2009.12.02.06.30.23 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 02 Dec 2009 06:30:24 -0800 (PST) Received: by holgerschurig@gmail.com (sSMTP sendmail emulation); Wed, 02 Dec 2009 15:29:51 +0100 Message-Id: <20091202142951.863122781@gmail.com> References: <20091202142555.654873300@gmail.com> User-Agent: quilt/0.46-1 Date: Wed, 02 Dec 2009 15:26:04 +0100 From: Holger Schurig To: John Linville , linux-wireless@vger.kernel.org, Dan Williams Subject: [PATCH 09/10] libertas: remove priv->ratebitmap Content-Disposition: inline; filename=lbs-priv-ratebitmap.patch Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org --- linux-wl.orig/drivers/net/wireless/libertas/dev.h +++ linux-wl/drivers/net/wireless/libertas/dev.h @@ -176,7 +176,6 @@ struct lbs_private { struct assoc_request * pending_assoc_req; struct assoc_request * in_progress_assoc_req; uint16_t enablehwauto; - uint16_t ratebitmap; /* ADHOC */ u16 beacon_period; --- linux-wl.orig/drivers/net/wireless/libertas/assoc.c +++ linux-wl/drivers/net/wireless/libertas/assoc.c @@ -390,10 +390,8 @@ int lbs_cmd_802_11_rate_adapt_rateset(st cmd.enablehwauto = cpu_to_le16(priv->enablehwauto); cmd.bitmap = lbs_rate_to_fw_bitmap(priv->cur_rate, priv->enablehwauto); ret = lbs_cmd_with_response(priv, CMD_802_11_RATE_ADAPT_RATESET, &cmd); - if (!ret && cmd_action == CMD_ACT_GET) { - priv->ratebitmap = le16_to_cpu(cmd.bitmap); + if (!ret && cmd_action == CMD_ACT_GET) priv->enablehwauto = le16_to_cpu(cmd.enablehwauto); - } lbs_deb_leave_args(LBS_DEB_CMD, "ret %d", ret); return ret;