summaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_init.c
diff options
context:
space:
mode:
authorDhananjay Phadke2007-09-03 07:03:35 +0200
committerDavid S. Miller2007-10-11 01:51:52 +0200
commit200eef20db6de7535438c9af9becc8169c6cb6c0 (patch)
tree119bd4a21e176dfaf7a0b58687ad84c57fe79799 /drivers/net/netxen/netxen_nic_init.c
parentDevice tree aware EMAC driver (diff)
downloadkernel-qcow2-linux-200eef20db6de7535438c9af9becc8169c6cb6c0.tar.gz
kernel-qcow2-linux-200eef20db6de7535438c9af9becc8169c6cb6c0.tar.xz
kernel-qcow2-linux-200eef20db6de7535438c9af9becc8169c6cb6c0.zip
netxen: ethtool fixes
Resubmitting the patch. This patch improves ethtool support for printing correct ring statistics, segmentation offload status, etc. Signed-off by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_init.c')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 1811bcb8c380..37589265297e 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1118,10 +1118,13 @@ netxen_process_rcv(struct netxen_adapter *adapter, int ctxid,
skb = (struct sk_buff *)buffer->skb;
- if (likely(netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
+ if (likely(adapter->rx_csum &&
+ netxen_get_sts_status(desc) == STATUS_CKSUM_OK)) {
adapter->stats.csummed++;
skb->ip_summed = CHECKSUM_UNNECESSARY;
- }
+ } else
+ skb->ip_summed = CHECKSUM_NONE;
+
skb->dev = netdev;
if (desc_ctx == RCV_DESC_LRO_CTXID) {
/* True length was only available on the last pkt */