From: Anton Blanchard <anton@samba.org>
To: brking@linux.vnet.ibm.com, santil@linux.vnet.ibm.com
Cc: netdev@vger.kernel.org
Subject: [patch 03/20] ibmveth: Remove LLTX
Date: Mon, 23 Aug 2010 10:09:33 +1000 [thread overview]
Message-ID: <20100823001238.571202133@samba.org> (raw)
In-Reply-To: 20100823000930.546065833@samba.org
[-- Attachment #1: veth_no_lltx --]
[-- Type: text/plain, Size: 2257 bytes --]
The ibmveth adapter needs locking in the transmit routine to protect
the bounce_buffer but it sets LLTX and forgets to add any of its own
locking.
Just remove the deprecated LLTX option. Remove the stats lock in the process.
Signed-off-by: Anton Blanchard <anton@samba.org>
---
Index: net-next-2.6/drivers/net/ibmveth.c
===================================================================
--- net-next-2.6.orig/drivers/net/ibmveth.c 2010-08-23 08:52:27.963919704 +1000
+++ net-next-2.6/drivers/net/ibmveth.c 2010-08-23 08:52:28.563877123 +1000
@@ -903,7 +903,6 @@ static netdev_tx_t ibmveth_start_xmit(st
union ibmveth_buf_desc desc;
unsigned long lpar_rc;
unsigned long correlator;
- unsigned long flags;
unsigned int retry_count;
unsigned int tx_dropped = 0;
unsigned int tx_bytes = 0;
@@ -965,20 +964,18 @@ static netdev_tx_t ibmveth_start_xmit(st
} else {
tx_packets++;
tx_bytes += skb->len;
- netdev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */
}
if (!used_bounce)
dma_unmap_single(&adapter->vdev->dev, data_dma_addr,
skb->len, DMA_TO_DEVICE);
-out: spin_lock_irqsave(&adapter->stats_lock, flags);
+out:
netdev->stats.tx_dropped += tx_dropped;
netdev->stats.tx_bytes += tx_bytes;
netdev->stats.tx_packets += tx_packets;
adapter->tx_send_failed += tx_send_failed;
adapter->tx_map_failed += tx_map_failed;
- spin_unlock_irqrestore(&adapter->stats_lock, flags);
dev_kfree_skb(skb);
return NETDEV_TX_OK;
@@ -1290,8 +1287,6 @@ static int __devinit ibmveth_probe(struc
netdev->netdev_ops = &ibmveth_netdev_ops;
netdev->ethtool_ops = &netdev_ethtool_ops;
SET_NETDEV_DEV(netdev, &dev->dev);
- netdev->features |= NETIF_F_LLTX;
- spin_lock_init(&adapter->stats_lock);
memcpy(netdev->dev_addr, &adapter->mac_addr, netdev->addr_len);
Index: net-next-2.6/drivers/net/ibmveth.h
===================================================================
--- net-next-2.6.orig/drivers/net/ibmveth.h 2010-08-23 08:52:27.963919704 +1000
+++ net-next-2.6/drivers/net/ibmveth.h 2010-08-23 08:52:28.563877123 +1000
@@ -158,7 +158,6 @@ struct ibmveth_adapter {
u64 rx_no_buffer;
u64 tx_map_failed;
u64 tx_send_failed;
- spinlock_t stats_lock;
};
struct ibmveth_buf_desc_fields {
next prev parent reply other threads:[~2010-08-23 0:27 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-23 0:09 [patch 00/20] ibmveth update Anton Blanchard
2010-08-23 0:09 ` [patch 01/20] ibmveth: Remove integer divide caused by modulus Anton Blanchard
2010-08-23 0:09 ` [patch 02/20] ibmveth: batch rx buffer replacement Anton Blanchard
2010-08-23 0:09 ` Anton Blanchard [this message]
2010-08-23 0:09 ` [patch 04/20] ibmveth: Add tx_copybreak Anton Blanchard
2010-08-23 0:09 ` [patch 05/20] ibmveth: Add rx_copybreak Anton Blanchard
2010-08-23 0:09 ` [patch 06/20] ibmveth: Use lighter weight read memory barrier in ibmveth_poll Anton Blanchard
2010-08-23 0:09 ` [patch 07/20] ibmveth: Add scatter-gather support Anton Blanchard
2010-08-23 0:09 ` [patch 08/20] ibmveth: Dont overallocate buffers Anton Blanchard
2010-08-23 20:49 ` Robert Jennings
2010-08-25 13:44 ` Brian King
2010-08-23 0:09 ` [patch 09/20] ibmveth: Add optional flush of rx buffer Anton Blanchard
2010-08-23 0:09 ` [patch 10/20] ibmveth: remove procfs code Anton Blanchard
2010-08-23 0:09 ` [patch 11/20] ibmveth: Convert to netdev_alloc_skb Anton Blanchard
2010-08-23 0:09 ` [patch 12/20] ibmveth: Remove redundant function prototypes Anton Blanchard
2010-08-23 0:09 ` [patch 13/20] ibmveth: Convert driver specific debug to netdev_dbg Anton Blanchard
2010-08-23 0:09 ` [patch 14/20] ibmveth: Convert driver specific error functions to netdev_err Anton Blanchard
2010-08-23 0:09 ` [patch 15/20] ibmveth: Some formatting fixes Anton Blanchard
2010-08-23 0:09 ` [patch 16/20] ibmveth: Coding style fixes Anton Blanchard
2010-08-23 0:09 ` [patch 17/20] ibmveth: Return -EINVAL on all ->probe errors Anton Blanchard
2010-08-23 0:09 ` [patch 18/20] ibmveth: Convert driver specific assert to BUG_ON Anton Blanchard
2010-08-23 0:09 ` [patch 19/20] ibmveth: Remove some unnecessary include files Anton Blanchard
2010-08-23 0:09 ` [patch 20/20] ibmveth: Update module information and version Anton Blanchard
2010-08-23 1:57 ` [patch 00/20] ibmveth update David Miller
2010-08-23 2:07 ` Anton Blanchard
2010-08-23 2:15 ` David Miller
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=20100823001238.571202133@samba.org \
--to=anton@samba.org \
--cc=brking@linux.vnet.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=santil@linux.vnet.ibm.com \
/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.