Patchwork [-next] ixgbe: use NETIF_F_LRO

login
register
mail settings
Submitter Stanislaw Gruszka
Date June 29, 2010, 2:38 p.m.
Message ID <20100629163857.0dcc1245@dhcp-lab-109.englab.brq.redhat.com>
Download mbox | patch
Permalink /patch/57277/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Stanislaw Gruszka - June 29, 2010, 2:38 p.m.
Both ETH_FLAG_LRO and NETIF_F_LRO have the same value, but NETIF_F_LRO
is intended to use with netdev->features.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/ixgbe/ixgbe_ethtool.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Jeff Kirsher - June 29, 2010, 6 p.m.
On Tue, Jun 29, 2010 at 07:38, Stanislaw Gruszka <sgruszka@redhat.com> wrote:
> Both ETH_FLAG_LRO and NETIF_F_LRO have the same value, but NETIF_F_LRO
> is intended to use with netdev->features.
>
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> ---
>  drivers/net/ixgbe/ixgbe_ethtool.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
> index 873b45e..e2ab4ae 100644
> --- a/drivers/net/ixgbe/ixgbe_ethtool.c
> +++ b/drivers/net/ixgbe/ixgbe_ethtool.c
> @@ -2227,7 +2227,7 @@ static int ixgbe_set_flags(struct net_device *netdev, u32 data)
>                                break;
>                        }
>                } else if (!adapter->rx_itr_setting) {
> -                       netdev->features &= ~ETH_FLAG_LRO;
> +                       netdev->features &= ~NETIF_F_LRO;
>                        if (data & ETH_FLAG_LRO)
>                                e_info("rx-usecs set to 0, "
>                                        "LRO/RSC cannot be enabled.\n");
> --

Thanks, I have added it to my queue of patches.

Patch

diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c
index 873b45e..e2ab4ae 100644
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@ -2227,7 +2227,7 @@  static int ixgbe_set_flags(struct net_device *netdev, u32 data)
 				break;
 			}
 		} else if (!adapter->rx_itr_setting) {
-			netdev->features &= ~ETH_FLAG_LRO;
+			netdev->features &= ~NETIF_F_LRO;
 			if (data & ETH_FLAG_LRO)
 				e_info("rx-usecs set to 0, "
 					"LRO/RSC cannot be enabled.\n");