From patchwork Mon Oct 12 09:57:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Surbhi Palande X-Patchwork-Id: 35743 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 761A7B7334 for ; Mon, 12 Oct 2009 20:59:09 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1MxHg8-0007kB-4x; Mon, 12 Oct 2009 10:58:56 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1MxHeo-0007TO-Tu for kernel-team@lists.canonical.com; Mon, 12 Oct 2009 10:57:35 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1MxHeo-0001yE-Q6 for ; Mon, 12 Oct 2009 10:57:34 +0100 Received: from a88-112-252-196.elisa-laajakaista.fi ([88.112.252.196] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1MxHeo-0004nQ-7e for kernel-team@lists.canonical.com; Mon, 12 Oct 2009 10:57:34 +0100 From: Surbhi Palande To: kernel-team@lists.canonical.com Subject: [PATCH] UBUNTU: [Upstream] e1000e: swap max hw supported frame size between Date: Mon, 12 Oct 2009 12:57:33 +0300 Message-Id: <1255341453-13936-1-git-send-email-surbhi.palande@canonical.com> X-Mailer: git-send-email 1.6.0.4 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This patch adds support for the Jumbo frame size provided by 82574 NIC. This fixes the bug 445572 reported in launchpad. This patch was cherry picked from upstream commit a825e00c98a2ee37eb2a0ad93b352e79d2bc1593 This was merged upstream post 2.6.31. So, do consider merging this for Karmic. The following changes since commit 5178c21a72651fa485ac8158eef6b3d1b3086b06: Tim Gardner (1): UBUNTU: Ubuntu-2.6.31-13.44 are available in the git repository at: git://kernel.ubuntu.com/surbhi/ubuntu-karmic.git lp445572 Alexander Duyck (1): UBUNTU: [Upstream] e1000e: swap max hw supported frame size between 82574 and 82583 drivers/net/e1000e/82571.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) From aad181ab08a8872185c6b0c9a2892aa1053ae99c Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Fri, 2 Oct 2009 12:30:42 +0000 Subject: [PATCH] [PATCH] UBUNTU: [Upstream] e1000e: swap max hw supported frame size between 82574 and 82583 BugLink: //https://bugs.launchpad.net/bugs/445572 There appears to have been a mixup in the max supported jumbo frame size between 82574 and 82583 which ended up disabling jumbo frames on the 82574 as a result. This patch swaps the two so that this issue is resolved. This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=14261 Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller (cherry picked from commit a825e00c98a2ee37eb2a0ad93b352e79d2bc1593) Signed-off-by: Surbhi Palande Acked-by: Stefan Bader --- drivers/net/e1000e/82571.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000e/82571.c b/drivers/net/e1000e/82571.c index b53b40b..d1e0563 100644 --- a/drivers/net/e1000e/82571.c +++ b/drivers/net/e1000e/82571.c @@ -1803,7 +1803,7 @@ struct e1000_info e1000_82574_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .pba = 20, - .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, + .max_hw_frame_size = DEFAULT_JUMBO, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_bm, @@ -1820,7 +1820,7 @@ struct e1000_info e1000_82583_info = { | FLAG_HAS_AMT | FLAG_HAS_CTRLEXT_ON_LOAD, .pba = 20, - .max_hw_frame_size = DEFAULT_JUMBO, + .max_hw_frame_size = ETH_FRAME_LEN + ETH_FCS_LEN, .get_variants = e1000_get_variants_82571, .mac_ops = &e82571_mac_ops, .phy_ops = &e82_phy_ops_bm,