Commit 78f710dc authored by Masakazu Mokuno's avatar Masakazu Mokuno Committed by Jeff Garzik

ps3: removed conditional ethtool support

Removed conditional ethtool support.  Always enabled.
Signed-off-by: default avatarMasakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent b3bd6fe9
......@@ -1160,7 +1160,6 @@ static int gelic_net_open(struct net_device *netdev)
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
}
/**
......
......@@ -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 */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment