diff options
author | Masakazu Mokuno <mokuno@sm.sony.co.jp> | 2007-07-20 04:28:59 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-07-24 16:28:39 -0400 |
commit | 78f710dc186f34fb14d8b22a33749a56013e7b85 (patch) | |
tree | 6e750e0ef0022c95bd0b27b8625e9873ce31a5ff /drivers/net/ps3_gelic_net.c | |
parent | b3bd6fe96da32e4e818b51826f04349cee9b15ba (diff) |
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>
Diffstat (limited to 'drivers/net/ps3_gelic_net.c')
-rw-r--r-- | drivers/net/ps3_gelic_net.c | 4 |
1 files changed, 0 insertions, 4 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: | |||
1160 | return -ENOMEM; | 1160 | return -ENOMEM; |
1161 | } | 1161 | } |
1162 | 1162 | ||
1163 | #ifdef GELIC_NET_ETHTOOL | ||
1164 | static void gelic_net_get_drvinfo (struct net_device *netdev, | 1163 | static void gelic_net_get_drvinfo (struct net_device *netdev, |
1165 | struct ethtool_drvinfo *info) | 1164 | struct ethtool_drvinfo *info) |
1166 | { | 1165 | { |
@@ -1280,7 +1279,6 @@ static struct ethtool_ops gelic_net_ethtool_ops = { | |||
1280 | .get_rx_csum = gelic_net_get_rx_csum, | 1279 | .get_rx_csum = gelic_net_get_rx_csum, |
1281 | .set_rx_csum = gelic_net_set_rx_csum, | 1280 | .set_rx_csum = gelic_net_set_rx_csum, |
1282 | }; | 1281 | }; |
1283 | #endif | ||
1284 | 1282 | ||
1285 | /** | 1283 | /** |
1286 | * gelic_net_tx_timeout_task - task scheduled by the watchdog timeout | 1284 | * 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) | |||
1348 | /* NAPI */ | 1346 | /* NAPI */ |
1349 | netdev->poll = &gelic_net_poll; | 1347 | netdev->poll = &gelic_net_poll; |
1350 | netdev->weight = GELIC_NET_NAPI_WEIGHT; | 1348 | netdev->weight = GELIC_NET_NAPI_WEIGHT; |
1351 | #ifdef GELIC_NET_ETHTOOL | ||
1352 | netdev->ethtool_ops = &gelic_net_ethtool_ops; | 1349 | netdev->ethtool_ops = &gelic_net_ethtool_ops; |
1353 | #endif | ||
1354 | } | 1350 | } |
1355 | 1351 | ||
1356 | /** | 1352 | /** |