From 058861ce23b2d7025234893757108d6b220de8e0 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka Date: Thu, 1 Jul 2010 13:58:25 +0000 Subject: [PATCH] --- yaml --- r: 203347 b: refs/heads/master c: 0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba h: refs/heads/master i: 203345: a82c8a8cbd5b90e68a03f88e93627f95b0840d19 203343: 0bedc9eeea73b4b6bf0867daa8543f4c7e8b6baf v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgbe/ixgbe_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 40cfee02f363..cd13e266b689 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de42edde131cd09a556f0b90373569d64b92ef99 +refs/heads/master: 0a17d8c744e44617a3c22e7af68b4c5c9c1c5dba diff --git a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c index b50b5ea4cf83..5275e9c95039 100644 --- a/trunk/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ixgbe/ixgbe_ethtool.c @@ -2237,7 +2237,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");