From: Anton Blanchard <anton@samba.org>
To: leitao@linux.vnet.ibm.com
Cc: netdev@vger.kernel.org, michael@ellerman.id.au
Subject: [PATCH 12/14] ehea: Add some more ethtool operations and 64bit stats
Date: Tue, 5 Apr 2011 21:42:49 +1000 [thread overview]
Message-ID: <20110405214249.36d248e7@kryten> (raw)
In-Reply-To: <20110405212825.6eb85677@kryten>
We can use the standard ethtool functions for set_tx_csum and set_sg.
Also switch to using ndo_get_stats64 to get 64bit tx/rx stats.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: linux-2.6/drivers/net/ehea/ehea_ethtool.c
===================================================================
--- linux-2.6.orig/drivers/net/ehea/ehea_ethtool.c 2011-03-25 18:34:06.358846652 +1100
+++ linux-2.6/drivers/net/ehea/ehea_ethtool.c 2011-03-25 18:37:37.982330408 +1100
@@ -295,6 +295,8 @@ const struct ethtool_ops ehea_ethtool_op
.get_flags = ethtool_op_get_flags,
.set_flags = ehea_set_flags,
.nway_reset = ehea_nway_reset, /* Restart autonegotiation */
+ .set_tx_csum = ethtool_op_set_tx_csum,
+ .set_sg = ethtool_op_set_sg,
};
void ehea_set_ethtool_ops(struct net_device *netdev)
Index: linux-2.6/drivers/net/ehea/ehea_main.c
===================================================================
--- linux-2.6.orig/drivers/net/ehea/ehea_main.c 2011-03-25 18:34:06.378861533 +1100
+++ linux-2.6/drivers/net/ehea/ehea_main.c 2011-03-25 18:37:02.810025945 +1100
@@ -321,10 +321,10 @@ out:
spin_unlock_irqrestore(&ehea_bcmc_regs.lock, flags);
}
-static struct net_device_stats *ehea_get_stats(struct net_device *dev)
+static struct rtnl_link_stats64 *ehea_get_stats64(struct net_device *dev,
+ struct rtnl_link_stats64 *stats)
{
struct ehea_port *port = netdev_priv(dev);
- struct net_device_stats *stats = &port->stats;
struct hcp_ehea_port_cb2 *cb2;
u64 hret, rx_packets, tx_packets, rx_bytes = 0, tx_bytes = 0;
int i;
@@ -3038,7 +3038,7 @@ static const struct net_device_ops ehea_
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = ehea_netpoll,
#endif
- .ndo_get_stats = ehea_get_stats,
+ .ndo_get_stats64 = ehea_get_stats64,
.ndo_set_mac_address = ehea_set_mac_addr,
.ndo_validate_addr = eth_validate_addr,
.ndo_set_multicast_list = ehea_set_multicast_list,
next prev parent reply other threads:[~2011-04-05 11:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 11:28 [PATCH 1/14] ehea: Remove NETIF_F_LLTX Anton Blanchard
2011-04-05 11:29 ` [PATCH 2/14] ehea: Update multiqueue support Anton Blanchard
2011-04-11 1:13 ` Michael Ellerman
2011-04-05 11:30 ` [PATCH 3/14] ehea: Remove force_irq logic in napi poll routine Anton Blanchard
2011-04-05 11:32 ` [PATCH 4/14] ehea: Remove num_tx_qps module option Anton Blanchard
2011-04-05 11:33 ` [PATCH 5/14] ehea: Don't check NETIF_F_TSO in TX path Anton Blanchard
2011-04-05 11:35 ` [PATCH 6/14] ehea: Add vlan_features Anton Blanchard
2011-04-05 11:36 ` [PATCH 7/14] ehea: Allocate large enough skbs to avoid partial cacheline DMA writes Anton Blanchard
2011-04-05 11:39 ` [PATCH 8/14] ehea: Simplify ehea_xmit2 and ehea_xmit3 Anton Blanchard
2011-04-05 11:40 ` [PATCH 9/14] ehea: Merge swqe2 TSO and non TSO paths Anton Blanchard
2011-04-05 11:41 ` [PATCH 10/14] ehea: Simplify type 3 transmit routine Anton Blanchard
2011-04-05 11:41 ` [PATCH 11/14] ehea: Remove some unused definitions Anton Blanchard
2011-04-05 11:42 ` Anton Blanchard [this message]
2011-04-05 13:07 ` [PATCH 12/14] ehea: Add some more ethtool operations and 64bit stats Ben Hutchings
2011-04-05 21:35 ` Anton Blanchard
2011-04-05 11:43 ` [PATCH 13/14] ehea: Remove LRO support Anton Blanchard
2011-04-05 11:45 ` [PATCH 14/14] ehea: Add GRO support Anton Blanchard
2011-04-05 21:29 ` Jesse Gross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110405214249.36d248e7@kryten \
--to=anton@samba.org \
--cc=leitao@linux.vnet.ibm.com \
--cc=michael@ellerman.id.au \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.