diff --git a/[refs] b/[refs] index 04427a29a634..eeaec9911d2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fe242cfd3390b1c7d54d60f7ebb6a4054804cd41 +refs/heads/master: 9e0db4b12c7deda532ad13d37a84ee41dd691066 diff --git a/trunk/drivers/net/loopback.c b/trunk/drivers/net/loopback.c index 2617320efa95..d6997aec45dd 100644 --- a/trunk/drivers/net/loopback.c +++ b/trunk/drivers/net/loopback.c @@ -154,6 +154,7 @@ static int loopback_xmit(struct sk_buff *skb, struct net_device *dev) #endif dev->last_rx = jiffies; + /* it's OK to use per_cpu_ptr() because BHs are off */ pcpu_lstats = netdev_priv(dev); lb_stats = per_cpu_ptr(pcpu_lstats, smp_processor_id()); lb_stats->bytes += skb->len; @@ -221,7 +222,8 @@ static void loopback_dev_free(struct net_device *dev) } /* - * The loopback device is special. There is only one instance. + * The loopback device is special. There is only one instance + * per network namespace. */ static void loopback_setup(struct net_device *dev) {