git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
loopback.c
diff --git
a/drivers/net/loopback.c
b/drivers/net/loopback.c
index eae4ad749e9d87956facbfadd53036d5d882ce03..b9fcc9819837e7f79530ad11782272ea0f81a344 100644
(file)
--- a/
drivers/net/loopback.c
+++ b/
drivers/net/loopback.c
@@
-81,7
+81,7
@@
static netdev_tx_t loopback_xmit(struct sk_buff *skb,
/* it's OK to use per_cpu_ptr() because BHs are off */
pcpu_lstats = dev->ml_priv;
- lb_stats =
per_cpu_ptr(pcpu_lstats, smp_processor_id()
);
+ lb_stats =
this_cpu_ptr(pcpu_lstats
);
len = skb->len;
if (likely(netif_rx(skb) == NET_RX_SUCCESS)) {