mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

PS3: gelic: remove duplicated ethtool handlers

Browse source 
Remove some ethtool handlers, which duplicate functionality that was already
provided by the common ethtool handlers.

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 2008-02-07 19:58:20 +09:00 committed by Jeff Garzik
parent 59e973277c
commit 7bc56b92b0
1 changed files with 3 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
drivers/net/ps3_gelic_net.c
View file

@ -1196,28 +1196,6 @@ static int gelic_ether_get_settings(struct net_device *netdev,
return 0; return 0;
} }
static u32 gelic_ether_get_link(struct net_device *netdev)
{
struct gelic_card *card = netdev_priv(netdev);
int status;
u64 v1, v2;
int link;
status = lv1_net_control(bus_id(card), dev_id(card),
GELIC_LV1_GET_ETH_PORT_STATUS,
GELIC_LV1_VLAN_TX_ETHERNET, 0, 0,
&v1, &v2);
if (status)
return 0; /* link down */
if (v1 & GELIC_LV1_ETHER_LINK_UP)
link = 1;
else
link = 0;
return link;
}
static int gelic_net_nway_reset(struct net_device *netdev) static int gelic_net_nway_reset(struct net_device *netdev)
{ {
if (netif_running(netdev)) { if (netif_running(netdev)) {
@ -1227,21 +1205,6 @@ static int gelic_net_nway_reset(struct net_device *netdev)
return 0; return 0;
} }
static u32 gelic_net_get_tx_csum(struct net_device *netdev)
{
return (netdev->features & NETIF_F_IP_CSUM) != 0;
}
static int gelic_net_set_tx_csum(struct net_device *netdev, u32 data)
{
if (data)
netdev->features |= NETIF_F_IP_CSUM;
else
netdev->features &= ~NETIF_F_IP_CSUM;
return 0;
}
static u32 gelic_net_get_rx_csum(struct net_device *netdev) static u32 gelic_net_get_rx_csum(struct net_device *netdev)
{ {
struct gelic_card *card = netdev_priv(netdev); struct gelic_card *card = netdev_priv(netdev);
@ -1260,10 +1223,10 @@ static int gelic_net_set_rx_csum(struct net_device *netdev, u32 data)
static struct ethtool_ops gelic_net_ethtool_ops = { static struct ethtool_ops gelic_net_ethtool_ops = {
.get_drvinfo = gelic_net_get_drvinfo, .get_drvinfo = gelic_net_get_drvinfo,
.get_settings = gelic_ether_get_settings, .get_settings = gelic_ether_get_settings,
.get_link = gelic_ether_get_link, .get_link = ethtool_op_get_link,
.nway_reset = gelic_net_nway_reset, .nway_reset = gelic_net_nway_reset,
.get_tx_csum = gelic_net_get_tx_csum, .get_tx_csum = ethtool_op_get_tx_csum,
.set_tx_csum = gelic_net_set_tx_csum, .set_tx_csum = ethtool_op_set_tx_csum,
.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,
}; };