From patchwork Fri Nov 20 15:12:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Kagstrom X-Patchwork-Id: 38925 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 0ED10B6F16 for ; Sat, 21 Nov 2009 02:17:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754011AbZKTPQo (ORCPT ); Fri, 20 Nov 2009 10:16:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754007AbZKTPQn (ORCPT ); Fri, 20 Nov 2009 10:16:43 -0500 Received: from ernst.netinsight.se ([194.16.221.21]:42331 "HELO ernst.netinsight.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753990AbZKTPQm (ORCPT ); Fri, 20 Nov 2009 10:16:42 -0500 X-Greylist: delayed 606 seconds by postgrey-1.27 at vger.kernel.org; Fri, 20 Nov 2009 10:16:39 EST Received: from marrow.netinsight.se (unverified [10.100.3.78]) by ernst.netinsight.se (EMWAC SMTPRS 0.83) with SMTP id ; Fri, 20 Nov 2009 16:12:09 +0100 Date: Fri, 20 Nov 2009 16:12:10 +0100 From: Simon Kagstrom To: netdev@vger.kernel.org Cc: davem@davemloft.net, davej@redhat.com, shemminger@vyatta.com, romieu@fr.zoreil.com Subject: [PATCH 2/7] via-velocity: Correct 64-byte alignment for rx buffers Message-ID: <20091120161210.592361bc@marrow.netinsight.se> In-Reply-To: <20091120160633.77b7aee0@marrow.netinsight.se> References: <20091120160633.77b7aee0@marrow.netinsight.se> X-Mailer: Claws Mail 3.7.3 (GTK+ 2.16.1; i486-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org (From the VIA driver). The current code does not guarantee 64-byte alignment since it simply does int add = skb->data & 63; skb->data += add; (via skb_reserve). So for example, if add would be 0x10, this would result in 32-byte alignment. Correct by adding 64 - (skb->data & 63) instead. Signed-off-by: Simon Kagstrom --- drivers/net/via-velocity.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/via-velocity.c b/drivers/net/via-velocity.c index af79969..944a678 100644 --- a/drivers/net/via-velocity.c +++ b/drivers/net/via-velocity.c @@ -1483,7 +1483,8 @@ static int velocity_alloc_rx_buf(struct velocity_info *vptr, int idx) * Do the gymnastics to get the buffer head for data at * 64byte alignment. */ - skb_reserve(rd_info->skb, (unsigned long) rd_info->skb->data & 63); + skb_reserve(rd_info->skb, + 64 - ((unsigned long) rd_info->skb->data & 63)); rd_info->skb_dma = pci_map_single(vptr->pdev, rd_info->skb->data, vptr->rx.buf_sz, PCI_DMA_FROMDEVICE);