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>

diff --cc drivers/net/ixgbe/ixgbe_ethtool.c
index 644e3d21b751e4056d2ce08f58947e4968b4aafd,3a93a81872b87153404111152bf5860307815772..873b45efca40f7847e2d317091e0d583a1614fe5
--- 1/drivers/net/ixgbe/ixgbe_ethtool.c
--- 2/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;
 -                              DPRINTK(PROBE, INFO, "rx-usecs set to 0, "
+                       if (data & ETH_FLAG_LRO)
++                              e_info("rx-usecs set to 0, "
+                                       "LRO/RSC cannot be enabled.\n");
                }
        }
  

diff --cc drivers/net/ixgbe/ixgbe_main.c
Simple merge