From 829f67346995aa52b00e98623cd5176c8e53779f Mon Sep 17 00:00:00 2001 From: Tom Herbert Date: Thu, 7 Oct 2010 10:09:10 +0000 Subject: [PATCH] --- yaml --- r: 215123 b: refs/heads/master c: 4315d834c1496ddca977e9e22002b77c85bfec2c h: refs/heads/master i: 215121: b3542f9baab367f50805f3e7e6b1a8c04d358ad0 215119: f7a6df51ab97fb891febc521fc594fa5dce8df02 v: v3 --- [refs] | 2 +- trunk/net/core/dev.c | 1 - trunk/net/core/net-sysfs.c | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index de07f0e8ede9..4e7e8e600852 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a131d82266e77b8eb8a2dab930a94ed0de9e91b0 +refs/heads/master: 4315d834c1496ddca977e9e22002b77c85bfec2c diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index 4962c8afd606..193eafaabd88 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -5024,7 +5024,6 @@ static int netif_alloc_rx_queues(struct net_device *dev) return -ENOMEM; } dev->_rx = rx; - atomic_set(&rx->count, count); /* * Set a pointer to first element in the array which holds the diff --git a/trunk/net/core/net-sysfs.c b/trunk/net/core/net-sysfs.c index fa81fd0a488f..b143173e3eb2 100644 --- a/trunk/net/core/net-sysfs.c +++ b/trunk/net/core/net-sysfs.c @@ -726,6 +726,7 @@ static struct kobj_type rx_queue_ktype = { static int rx_queue_add_kobject(struct net_device *net, int index) { struct netdev_rx_queue *queue = net->_rx + index; + struct netdev_rx_queue *first = queue->first; struct kobject *kobj = &queue->kobj; int error = 0; @@ -738,6 +739,7 @@ static int rx_queue_add_kobject(struct net_device *net, int index) } kobject_uevent(kobj, KOBJ_ADD); + atomic_inc(&first->count); return error; }