net: remove some sparse warnings

edumazet · davem330 · commit 2ce1ee178056 · 2015-02-05T00:41:17.000-08:00
netdev_adjacent_add_links() and netdev_adjacent_del_links()
are static.

queue-&gt;qdisc has __rcu annotation, need to use RCU_INIT_POINTER()

Signed-off-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/core/dev.c b/net/core/dev.c
@@ -5294,7 +5294,7 @@ void netdev_upper_dev_unlink(struct net_device *dev,
 }
 EXPORT_SYMBOL(netdev_upper_dev_unlink);
 
-void netdev_adjacent_add_links(struct net_device *dev)
+static void netdev_adjacent_add_links(struct net_device *dev)
 {
 	struct netdev_adjacent *iter;
 
@@ -5319,7 +5319,7 @@ void netdev_adjacent_add_links(struct net_device *dev)
 	}
 }
 
-void netdev_adjacent_del_links(struct net_device *dev)
+static void netdev_adjacent_del_links(struct net_device *dev)
 {
 	struct netdev_adjacent *iter;
 
@@ -6627,7 +6627,7 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
 	if (!queue)
 		return NULL;
 	netdev_init_one_queue(dev, queue, NULL);
-	queue->qdisc = &noop_qdisc;
+	RCU_INIT_POINTER(queue->qdisc, &noop_qdisc);
 	queue->qdisc_sleeping = &noop_qdisc;
 	rcu_assign_pointer(dev->ingress_queue, queue);
 #endif

Original file line number	Diff line number	Diff line change
`@@ -5294,7 +5294,7 @@ void netdev_upper_dev_unlink(struct net_device *dev,`
`5294`	`5294`	`}`
`5295`	`5295`	`EXPORT_SYMBOL(netdev_upper_dev_unlink);`
`5296`	`5296`
`5297`		`-void netdev_adjacent_add_links(struct net_device *dev)`
	`5297`	`+static void netdev_adjacent_add_links(struct net_device *dev)`
`5298`	`5298`	`{`
`5299`	`5299`	`struct netdev_adjacent *iter;`
`5300`	`5300`
`@@ -5319,7 +5319,7 @@ void netdev_adjacent_add_links(struct net_device *dev)`
`5319`	`5319`	`}`
`5320`	`5320`	`}`
`5321`	`5321`
`5322`		`-void netdev_adjacent_del_links(struct net_device *dev)`
	`5322`	`+static void netdev_adjacent_del_links(struct net_device *dev)`
`5323`	`5323`	`{`
`5324`	`5324`	`struct netdev_adjacent *iter;`
`5325`	`5325`
`@@ -6627,7 +6627,7 @@ struct netdev_queue dev_ingress_queue_create(struct net_device dev)`
`6627`	`6627`	`if (!queue)`
`6628`	`6628`	`return NULL;`
`6629`	`6629`	`netdev_init_one_queue(dev, queue, NULL);`
`6630`		`- queue->qdisc = &noop_qdisc;`
	`6630`	`+ RCU_INIT_POINTER(queue->qdisc, &noop_qdisc);`
`6631`	`6631`	`queue->qdisc_sleeping = &noop_qdisc;`
`6632`	`6632`	`rcu_assign_pointer(dev->ingress_queue, queue);`
`6633`	`6633`	`#endif`