Patchwork UBUNTU: [Upstream] e1000e: swap max hw supported frame size between

login
register
mail settings
Submitter Surbhi Palande
Date Oct. 12, 2009, 9:57 a.m.
Message ID <1255341453-13936-1-git-send-email-surbhi.palande@canonical.com>
Download mbox | patch
Permalink /patch/35743/
State Accepted
Headers show

Comments

Surbhi Palande - Oct. 12, 2009, 9:57 a.m.
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 <alexander.h.duyck@intel.com>
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 <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit a825e00c98a2ee37eb2a0ad93b352e79d2bc1593)

Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com>
---
 drivers/net/e1000e/82571.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Stefan Bader - Oct. 12, 2009, 12:12 p.m.
Looks ok to me.

Surbhi Palande wrote:
> 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 <alexander.h.duyck@intel.com>
> 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 <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit a825e00c98a2ee37eb2a0ad93b352e79d2bc1593)
> 
> Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com>

Acked-by: Stefan Bader <stefan.bader@canonical.com>

> ---
>  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,
Tim Gardner - Oct. 12, 2009, 12:48 p.m.
Surbhi Palande wrote:
> 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 <alexander.h.duyck@intel.com>
> 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 <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: David S. Miller <davem@davemloft.net>
> (cherry picked from commit a825e00c98a2ee37eb2a0ad93b352e79d2bc1593)
> 
> Signed-off-by: Surbhi Palande <surbhi.palande@canonical.com>
> ---
>  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,

applied

Patch

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,