From patchwork Tue Nov 24 03:33:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 62379 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 nAO3UhUD005330 for ; Tue, 24 Nov 2009 03:30:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757901AbZKXDag (ORCPT ); Mon, 23 Nov 2009 22:30:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757849AbZKXDaf (ORCPT ); Mon, 23 Nov 2009 22:30:35 -0500 Received: from mga01.intel.com ([192.55.52.88]:44238 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757901AbZKXDaW (ORCPT ); Mon, 23 Nov 2009 22:30:22 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 23 Nov 2009 19:25:09 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,275,1257148800"; d="scan'208";a="516761388" Received: from yzhu-mobl0.sh.intel.com (HELO localhost.localdomain) ([10.239.47.104]) by fmsmga002.fm.intel.com with ESMTP; 23 Nov 2009 19:24:12 -0800 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Samuel Ortiz , Zhu Yi Subject: [PATCH 8/8] iwmc3200wifi: Remove tx concatenation option Date: Tue, 24 Nov 2009 11:33:33 +0800 Message-Id: <1259033613-25600-9-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1259033613-25600-8-git-send-email-yi.zhu@intel.com> References: <1259033613-25600-1-git-send-email-yi.zhu@intel.com> <1259033613-25600-2-git-send-email-yi.zhu@intel.com> <1259033613-25600-3-git-send-email-yi.zhu@intel.com> <1259033613-25600-4-git-send-email-yi.zhu@intel.com> <1259033613-25600-5-git-send-email-yi.zhu@intel.com> <1259033613-25600-6-git-send-email-yi.zhu@intel.com> <1259033613-25600-7-git-send-email-yi.zhu@intel.com> <1259033613-25600-8-git-send-email-yi.zhu@intel.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c index 01cc210..55905f0 100644 --- a/drivers/net/wireless/iwmc3200wifi/tx.c +++ b/drivers/net/wireless/iwmc3200wifi/tx.c @@ -354,8 +354,6 @@ static int iwm_tx_send_concat_packets(struct iwm_priv *iwm, return ret; } -#define CONFIG_IWM_TX_CONCATENATED 1 - void iwm_tx_worker(struct work_struct *work) { struct iwm_priv *iwm; @@ -414,11 +412,6 @@ void iwm_tx_worker(struct work_struct *work) "%d, color: %d\n", txq->id, skb, tx_info->sta, tx_info->color); -#if !CONFIG_IWM_TX_CONCATENATED - /* temporarily keep this to comparing the performance */ - ret = iwm_send_packet(iwm, skb, pool_id); -#else - if (txq->concat_count + cmdlen > IWM_HAL_CONCATENATE_BUF_SIZE) iwm_tx_send_concat_packets(iwm, txq); @@ -440,7 +433,7 @@ void iwm_tx_worker(struct work_struct *work) txq->concat_count += ALIGN(cmdlen, 16); mutex_unlock(&tid_info->mutex); -#endif + kfree_skb(skb); }