Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ps3: removed conditional ethtool support

Browse source 
Removed conditional ethtool support.  Always enabled.

Signed-off-by: Masakazu Mokuno <mokuno@sm.sony.co.jp>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Masakazu Mokuno 2007-07-20 17:28:59 +09:00 committed by Jeff Garzik
parent b3bd6fe96d
commit 78f710dc18
2 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ps3_gelic_net.c
View file

@ -1160,7 +1160,6 @@ static int gelic_net_open(struct net_device *netdev)
return -ENOMEM; return -ENOMEM;
} }
#ifdef GELIC_NET_ETHTOOL
static void gelic_net_get_drvinfo (struct net_device *netdev, static void gelic_net_get_drvinfo (struct net_device *netdev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
@ -1280,7 +1279,6 @@ static struct ethtool_ops gelic_net_ethtool_ops = {
.get_rx_csum = gelic_net_get_rx_csum, .get_rx_csum = gelic_net_get_rx_csum,
.set_rx_csum = gelic_net_set_rx_csum, .set_rx_csum = gelic_net_set_rx_csum,
}; };
#endif
/** /**
* gelic_net_tx_timeout_task - task scheduled by the watchdog timeout * 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 */ /* NAPI */
netdev->poll = &gelic_net_poll; netdev->poll = &gelic_net_poll;
netdev->weight = GELIC_NET_NAPI_WEIGHT; netdev->weight = GELIC_NET_NAPI_WEIGHT;
#ifdef GELIC_NET_ETHTOOL
netdev->ethtool_ops = &gelic_net_ethtool_ops; netdev->ethtool_ops = &gelic_net_ethtool_ops;
#endif
} }
/** /**

2
drivers/net/ps3_gelic_net.h
View file

@ -28,8 +28,6 @@
#ifndef _GELIC_NET_H #ifndef _GELIC_NET_H
#define _GELIC_NET_H #define _GELIC_NET_H
#define GELIC_NET_ETHTOOL /* use ethtool */
/* descriptors */ /* descriptors */
#define GELIC_NET_RX_DESCRIPTORS 128 /* num of descriptors */ #define GELIC_NET_RX_DESCRIPTORS 128 /* num of descriptors */
#define GELIC_NET_TX_DESCRIPTORS 128 /* num of descriptors */ #define GELIC_NET_TX_DESCRIPTORS 128 /* num of descriptors */