diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-15 12:10:10 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-15 12:10:10 +0900 |
| commit | e0aa51f54faa0659b529143de6c608e76675326f (patch) | |
| tree | 22fc566b74bfe6bd612a858ba354818900cdc394 /drivers/net/veth.c | |
| parent | 9f815a1765b0ce766ab1d26ef192d30410f70b2b (diff) | |
| parent | 3ea6b3d0e6d0ffd91c0f8cadeb69b7133c038b32 (diff) | |
| download | op-kernel-dev-e0aa51f54faa0659b529143de6c608e76675326f.zip op-kernel-dev-e0aa51f54faa0659b529143de6c608e76675326f.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 63099c5..3a15de5 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -153,15 +153,14 @@ static netdev_tx_t veth_xmit(struct sk_buff *skb, struct net_device *dev) struct net_device *rcv = NULL; struct veth_priv *priv, *rcv_priv; struct veth_net_stats *stats, *rcv_stats; - int length, cpu; + int length; priv = netdev_priv(dev); rcv = priv->peer; rcv_priv = netdev_priv(rcv); - cpu = smp_processor_id(); - stats = per_cpu_ptr(priv->stats, cpu); - rcv_stats = per_cpu_ptr(rcv_priv->stats, cpu); + stats = this_cpu_ptr(priv->stats); + rcv_stats = this_cpu_ptr(rcv_priv->stats); if (!(rcv->flags & IFF_UP)) goto tx_drop; |
