aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/ps3_gelic_net.c4
-rw-r--r--drivers/net/ps3_gelic_net.h2
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:
1160 return -ENOMEM; 1160 return -ENOMEM;
1161} 1161}
1162 1162
1163#ifdef GELIC_NET_ETHTOOL
1164static void gelic_net_get_drvinfo (struct net_device *netdev, 1163static 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/**
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 @@
28#ifndef _GELIC_NET_H 28#ifndef _GELIC_NET_H
29#define _GELIC_NET_H 29#define _GELIC_NET_H
30 30
31#define GELIC_NET_ETHTOOL /* use ethtool */
32
33/* descriptors */ 31/* descriptors */
34#define GELIC_NET_RX_DESCRIPTORS 128 /* num of descriptors */ 32#define GELIC_NET_RX_DESCRIPTORS 128 /* num of descriptors */
35#define GELIC_NET_TX_DESCRIPTORS 128 /* num of descriptors */ 33#define GELIC_NET_TX_DESCRIPTORS 128 /* num of descriptors */