From: David S. Miller <davem@davemloft.net>
Date: Tue, 15 Jun 2010 05:59:34 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.36-rc1~571^2~596
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=6b08f516244abda22c07b5e7db10ef109dc43f2d;p=net-next-2.6.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/ixgbe/ixgbe_ethtool.c

With merge conflict help from Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

6b08f516244abda22c07b5e7db10ef109dc43f2d
diff --cc drivers/net/ixgbe/ixgbe_ethtool.c
index 644e3d21b75,3a93a81872b..873b45efca4
--- a/drivers/net/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ixgbe/ixgbe_ethtool.c
@@@ -2155,9 -2132,11 +2130,10 @@@ static int ixgbe_set_coalesce(struct ne
  		 */
  		if (adapter->flags2 & IXGBE_FLAG2_RSC_ENABLED) {
  			adapter->flags2 &= ~IXGBE_FLAG2_RSC_ENABLED;
- 			netdev->features &= ~NETIF_F_LRO;
- 			e_info("rx-usecs set to 0, disabling RSC\n");
- 
+ 			if (netdev->features & NETIF_F_LRO) {
+ 				netdev->features &= ~NETIF_F_LRO;
 -				DPRINTK(PROBE, INFO, "rx-usecs set to 0, "
 -					"disabling LRO/RSC\n");
++				e_info("rx-usecs set to 0, disabling RSC\n");
+ 			}
  			need_reset = true;
  		}
  	}
@@@ -2252,6 -2231,9 +2228,9 @@@ static int ixgbe_set_flags(struct net_d
  			}
  		} else if (!adapter->rx_itr_setting) {
  			netdev->features &= ~ETH_FLAG_LRO;
+ 			if (data & ETH_FLAG_LRO)
 -				DPRINTK(PROBE, INFO, "rx-usecs set to 0, "
++				e_info("rx-usecs set to 0, "
+ 					"LRO/RSC cannot be enabled.\n");
  		}
  	}