[Cbe-oss-dev] [PATCH 5/10] ps3: removed conditional ethtool support

[Masakazu Mokuno]

Removed conditional ethtool support.  Always enabled.

Signed-off-by: Masakazu Mokuno <mokuno at sm.sony.co.jp>
---
 drivers/net/ps3_gelic_net.c |    4 ----
 drivers/net/ps3_gelic_net.h |    2 --
 2 files changed, 6 deletions(-)

--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1160,7 +1160,6 @@ alloc_tx_failed:
 	return -ENOMEM;
 }
 
-#ifdef GELIC_NET_ETHTOOL
 static void gelic_net_get_drvinfo (struct net_device *netdev,
 				   struct ethtool_drvinfo *info)
 {
@@ -1280,7 +1279,6 @@ static struct ethtool_ops gelic_net_etht
 	.get_rx_csum	= gelic_net_get_rx_csum,
 	.set_rx_csum	= gelic_net_set_rx_csum,
 };
-#endif
 
 /**
  * gelic_net_tx_timeout_task - task scheduled by the watchdog timeout
@@ -1348,9 +1346,7 @@ static void gelic_net_setup_netdev_ops(s
 	/* NAPI */
 	netdev->poll = &gelic_net_poll;
 	netdev->weight = GELIC_NET_NAPI_WEIGHT;
-#ifdef GELIC_NET_ETHTOOL
 	netdev->ethtool_ops = &gelic_net_ethtool_ops;
-#endif
 }
 
 /**
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -28,8 +28,6 @@
 #ifndef _GELIC_NET_H
 #define _GELIC_NET_H
 
-#define GELIC_NET_ETHTOOL               /* use ethtool */
-
 /* descriptors */
 #define GELIC_NET_RX_DESCRIPTORS        128 /* num of descriptors */
 #define GELIC_NET_TX_DESCRIPTORS        128 /* num of descriptors */

--
Masakazu MOKUNO