From patchwork Wed Apr 15 08:09:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislaw Gruszka X-Patchwork-Id: 25968 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 E539BDE0E7 for ; Wed, 15 Apr 2009 18:16:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754319AbZDOIPz (ORCPT ); Wed, 15 Apr 2009 04:15:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756745AbZDOIPy (ORCPT ); Wed, 15 Apr 2009 04:15:54 -0400 Received: from mx2.redhat.com ([66.187.237.31]:35246 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754370AbZDOIPw (ORCPT ); Wed, 15 Apr 2009 04:15:52 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n3F8FpO3021269; Wed, 15 Apr 2009 04:15:51 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n3F8FmVg028865; Wed, 15 Apr 2009 04:15:51 -0400 Received: from dhcp-lab-109.englab.brq.redhat.com (dhcp-lab-109.englab.brq.redhat.com [10.34.33.109]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n3F8Fjpr030579; Wed, 15 Apr 2009 04:15:45 -0400 Date: Wed, 15 Apr 2009 10:09:37 +0200 From: Stanislaw Gruszka To: netdev@vger.kernel.org Cc: Andrew Gallatin , Brice Goglin Subject: [PATCH] myr10ge: again fix lro_gen_skb() alignment Message-ID: <20090415100937.4b08ce28@dhcp-lab-109.englab.brq.redhat.com> Organization: RedHat Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.58 on 172.16.27.26 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add LRO alignment initially committed in 621544eb8c3beaa859c75850f816dd9b056a00a3 and removed in 0dcffac1a329be69bab0ac604bf7283737108e68 during conversion to multi-slice. Signed-off-by: Stanislaw Gruszka --- drivers/net/myri10ge/myri10ge.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index 9eed126..f2c4a66 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c @@ -2447,6 +2447,7 @@ static int myri10ge_open(struct net_device *dev) lro_mgr->lro_arr = ss->rx_done.lro_desc; lro_mgr->get_frag_header = myri10ge_get_frag_header; lro_mgr->max_aggr = myri10ge_lro_max_pkts; + lro_mgr->frag_align_pad = 2; if (lro_mgr->max_aggr > MAX_SKB_FRAGS) lro_mgr->max_aggr = MAX_SKB_FRAGS;