From patchwork Mon Nov 30 04:25:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhu Yi X-Patchwork-Id: 63614 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 nAU4MlpV025724 for ; Mon, 30 Nov 2009 04:22:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752960AbZK3EWj (ORCPT ); Sun, 29 Nov 2009 23:22:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753126AbZK3EWf (ORCPT ); Sun, 29 Nov 2009 23:22:35 -0500 Received: from mga09.intel.com ([134.134.136.24]:42736 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752960AbZK3EWe (ORCPT ); Sun, 29 Nov 2009 23:22:34 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 29 Nov 2009 20:22:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.47,310,1257148800"; d="scan'208";a="471404014" Received: from yzhu-mobl0.sh.intel.com (HELO localhost.localdomain) ([10.239.47.104]) by orsmga002.jf.intel.com with ESMTP; 29 Nov 2009 20:39:36 -0800 From: Zhu Yi To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, Zhu Yi , Johannes Berg Subject: [PATCH v3 2/2] iwmc3200wifi: rx aggregation support Date: Mon, 30 Nov 2009 12:25:57 +0800 Message-Id: <1259555157-10866-2-git-send-email-yi.zhu@intel.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1259555157-10866-1-git-send-email-yi.zhu@intel.com> References: <1259555157-10866-1-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/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 72c27a3..ab2247a 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c @@ -1534,6 +1534,37 @@ static void classify8023(struct sk_buff *skb) } } +static int iwm_rx_process_amsdu(struct iwm_priv *iwm, struct sk_buff *skb) +{ + struct wireless_dev *wdev = iwm_to_wdev(iwm); + struct net_device *ndev = iwm_to_ndev(iwm); + struct sk_buff_head list; + struct sk_buff *frame; + int ret; + + IWM_HEXDUMP(iwm, DBG, RX, "A-MSDU: ", skb->data, skb->len); + + __skb_queue_head_init(&list); + ret = ieee80211_amsdu_to_8023s(skb, &list, ndev->dev_addr, + wdev->iftype, 0); + if (ret) { + IWM_ERR(iwm, "decode A-MSDU frame failed\n"); + return -EINVAL; + } + + while ((frame = __skb_dequeue(&list))) { + ndev->stats.rx_packets++; + ndev->stats.rx_bytes += frame->len; + + if (netif_rx_ni(frame) == NET_RX_DROP) { + IWM_ERR(iwm, "Packet dropped\n"); + ndev->stats.rx_dropped++; + } + } + + return 0; +} + static void iwm_rx_process_packet(struct iwm_priv *iwm, struct iwm_rx_packet *packet, struct iwm_rx_ticket_node *ticket_node) @@ -1548,22 +1579,31 @@ static void iwm_rx_process_packet(struct iwm_priv *iwm, switch (le16_to_cpu(ticket_node->ticket->action)) { case IWM_RX_TICKET_RELEASE: IWM_DBG_RX(iwm, DBG, "RELEASE packet\n"); + + skb->dev = iwm_to_ndev(iwm); + skb->protocol = eth_type_trans(skb, ndev); + skb->ip_summed = CHECKSUM_NONE; + memset(skb->cb, 0, sizeof(skb->cb)); + classify8023(skb); iwm_rx_adjust_packet(iwm, packet, ticket_node); + + if (le16_to_cpu(ticket_node->ticket->flags) & + IWM_RX_TICKET_AMSDU_MSK) { + iwm_rx_process_amsdu(iwm, skb); + break; + } + ret = ieee80211_data_to_8023(skb, ndev->dev_addr, wdev->iftype); if (ret < 0) { IWM_DBG_RX(iwm, DBG, "Couldn't convert 802.11 header - " "%d\n", ret); + kfree_skb(packet->skb); break; } IWM_HEXDUMP(iwm, DBG, RX, "802.3: ", skb->data, skb->len); - skb->dev = iwm_to_ndev(iwm); - skb->protocol = eth_type_trans(skb, ndev); - skb->ip_summed = CHECKSUM_NONE; - memset(skb->cb, 0, sizeof(skb->cb)); - ndev->stats.rx_packets++; ndev->stats.rx_bytes += skb->len;