diff options
| author | Masakazu Mokuno <mokuno@sm.sony.co.jp> | 2007-07-20 17:28:59 +0900 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-07-24 16:28:39 -0400 |
| commit | 78f710dc186f34fb14d8b22a33749a56013e7b85 (patch) | |
| tree | 6e750e0ef0022c95bd0b27b8625e9873ce31a5ff | |
| parent | b3bd6fe96da32e4e818b51826f04349cee9b15ba (diff) | |
| download | linux-78f710dc186f34fb14d8b22a33749a56013e7b85.tar.gz linux-78f710dc186f34fb14d8b22a33749a56013e7b85.tar.bz2 linux-78f710dc186f34fb14d8b22a33749a56013e7b85.zip | |
ps3: removed conditional ethtool support
Removed conditional ethtool support. Always enabled.
Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
| -rw-r--r-- | drivers/net/ps3_gelic_net.c | 4 | ||||
| -rw-r--r-- | drivers/net/ps3_gelic_net.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index 143d7bdf7874..549e69bc5e80 100644 --- 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_ethtool_ops = { .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(struct net_device *netdev) /* NAPI */ netdev->poll = &gelic_net_poll; netdev->weight = GELIC_NET_NAPI_WEIGHT; -#ifdef GELIC_NET_ETHTOOL netdev->ethtool_ops = &gelic_net_ethtool_ops; -#endif } /** diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h index 2d14d3e9fd7a..0bd443474020 100644 --- 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 */ |