From patchwork Wed Nov 4 17:35:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartlomiej Zolnierkiewicz X-Patchwork-Id: 57698 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 nA4Hf3uR014081 for ; Wed, 4 Nov 2009 17:41:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932439AbZKDRgK (ORCPT ); Wed, 4 Nov 2009 12:36:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932414AbZKDRgI (ORCPT ); Wed, 4 Nov 2009 12:36:08 -0500 Received: from fg-out-1718.google.com ([72.14.220.156]:40568 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932429AbZKDRgG (ORCPT ); Wed, 4 Nov 2009 12:36:06 -0500 Received: by fg-out-1718.google.com with SMTP id d23so1960587fga.1 for ; Wed, 04 Nov 2009 09:36:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :in-reply-to:references:subject; bh=gqs9d7O/2yfKjMJ6t4lCWmBM/eB2DXvNOozYcD9vOBE=; b=uM3ArA/X/0C1pm3NRrjfbdTFCsmMksUGXj1zfh9vM5Z0i6CxTkWqutGR9ShZeG8VPH utHEg0EmKuVMrmRuYm6RY/4SGv+LFDg3amnHuMNYZcEAK56zZQtB8aE4OmoBh4NFXv3D Bv/6Q9gdOHakDRcCyQGA/bR9FZsEp4hTFOqVg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=gZDfRVpgxqsMoSi/55Fw1J26rf73qX7SGpoDRViFcDXeYLxEWvdhho+gQMgrLCXEst HJv1i9GZCs+zc5BIf0OHVyVRoaSbhyKArIcQyP0ynQtIgCLOeBdwEUGEySI3b2+Iq7oU HJ7/Ko4u0OLYa8PWT9VytKx+kAxQgQxpI8OeM= Received: by 10.86.106.21 with SMTP id e21mr4085868fgc.67.1257356170914; Wed, 04 Nov 2009 09:36:10 -0800 (PST) Received: from localhost.localdomain (chello089079027028.chello.pl [89.79.27.28]) by mx.google.com with ESMTPS id d6sm676660fga.10.2009.11.04.09.36.09 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 04 Nov 2009 09:36:10 -0800 (PST) From: Bartlomiej Zolnierkiewicz To: linux-wireless@vger.kernel.org Cc: Ivo van Doorn , Bartlomiej Zolnierkiewicz , Gertjan van Wingerde , linux-kernel@vger.kernel.org, "John W. Linville" Date: Wed, 04 Nov 2009 18:35:47 +0100 Message-Id: <20091104173547.28463.36376.sendpatchset@localhost.localdomain> In-Reply-To: <20091104173151.28463.68742.sendpatchset@localhost.localdomain> References: <20091104173151.28463.68742.sendpatchset@localhost.localdomain> Subject: [PATCH 31/41] rt2800usb: add RXINFO_DESC_SIZE definition Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Index: b/drivers/net/wireless/rt2x00/rt2800usb.c =================================================================== --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c @@ -2152,7 +2152,7 @@ static void rt2800usb_fill_rxdone(struct */ memcpy(skbdesc->desc, rxd, skbdesc->desc_len); rxd = (__le32 *)skbdesc->desc; - rxwi = &rxd[RXD_DESC_SIZE / sizeof(__le32)]; + rxwi = &rxd[RXINFO_DESC_SIZE / sizeof(__le32)]; /* * It is now safe to read the descriptor on all architectures. @@ -2874,7 +2874,7 @@ static const struct rt2x00lib_ops rt2800 static const struct data_queue_desc rt2800usb_queue_rx = { .entry_num = RX_ENTRIES, .data_size = AGGREGATION_SIZE, - .desc_size = RXD_DESC_SIZE + RXWI_DESC_SIZE, + .desc_size = RXINFO_DESC_SIZE + RXWI_DESC_SIZE, .priv_size = sizeof(struct queue_entry_priv_usb), }; Index: b/drivers/net/wireless/rt2x00/rt2800usb.h =================================================================== --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h @@ -1747,7 +1747,8 @@ struct mac_iveiv_entry { #define TXD_DESC_SIZE ( 4 * sizeof(__le32) ) #define TXINFO_DESC_SIZE ( 1 * sizeof(__le32) ) #define TXWI_DESC_SIZE ( 4 * sizeof(__le32) ) -#define RXD_DESC_SIZE ( 1 * sizeof(__le32) ) +#define RXD_DESC_SIZE ( 4 * sizeof(__le32) ) +#define RXINFO_DESC_SIZE ( 1 * sizeof(__le32) ) #define RXWI_DESC_SIZE ( 4 * sizeof(__le32) ) /*