Skip to content

Commit

Permalink
PS3: gelic: remove duplicated ethtool handlers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Masakazu Mokuno authored and Jeff Garzik committed Feb 11, 2008
1 parent 59e9732 commit 7bc56b9
Showing 1 changed file with 3 additions and 40 deletions.
43 changes: 3 additions & 40 deletions drivers/net/ps3_gelic_net.c
Original file line number Diff line number Diff line change
Expand Up @@ -1196,28 +1196,6 @@ static int gelic_ether_get_settings(struct net_device *netdev,
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)
{
if (netif_running(netdev)) {
Expand All @@ -1227,21 +1205,6 @@ static int gelic_net_nway_reset(struct net_device *netdev)
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)
{
struct gelic_card *card = netdev_priv(netdev);
Expand All @@ -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 = {
.get_drvinfo = gelic_net_get_drvinfo,
.get_settings = gelic_ether_get_settings,
.get_link = gelic_ether_get_link,
.get_link = ethtool_op_get_link,
.nway_reset = gelic_net_nway_reset,
.get_tx_csum = gelic_net_get_tx_csum,
.set_tx_csum = gelic_net_set_tx_csum,
.get_tx_csum = ethtool_op_get_tx_csum,
.set_tx_csum = ethtool_op_set_tx_csum,
.get_rx_csum = gelic_net_get_rx_csum,
.set_rx_csum = gelic_net_set_rx_csum,
};
Expand Down

0 comments on commit 7bc56b9

Please sign in to comment.