aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2015-02-04 16:37:44 -0500
committerDavid S. Miller <davem@davemloft.net>2015-02-05 03:41:17 -0500
commit2ce1ee1780564ba06ab4c1434aa03e347dc9169f (patch)
treeafbfd0d445469f7a7afe15454925ed3348774bd3
parentf4575d3534617eec98c7eb8701185cec96b4374b (diff)
net: remove some sparse warnings
netdev_adjacent_add_links() and netdev_adjacent_del_links() are static. queue->qdisc has __rcu annotation, need to use RCU_INIT_POINTER() Signed-off-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/dev.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c
index c87a2264a02b..7fe82929f509 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -5294,7 +5294,7 @@ void netdev_upper_dev_unlink(struct net_device *dev,
5294} 5294}
5295EXPORT_SYMBOL(netdev_upper_dev_unlink); 5295EXPORT_SYMBOL(netdev_upper_dev_unlink);
5296 5296
5297void netdev_adjacent_add_links(struct net_device *dev) 5297static void netdev_adjacent_add_links(struct net_device *dev)
5298{ 5298{
5299 struct netdev_adjacent *iter; 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
5322void netdev_adjacent_del_links(struct net_device *dev) 5322static void netdev_adjacent_del_links(struct net_device *dev)
5323{ 5323{
5324 struct netdev_adjacent *iter; 5324 struct netdev_adjacent *iter;
5325 5325
@@ -6627,7 +6627,7 @@ struct netdev_queue *dev_ingress_queue_create(struct net_device *dev)
6627 if (!queue) 6627 if (!queue)
6628 return NULL; 6628 return NULL;
6629 netdev_init_one_queue(dev, queue, NULL); 6629 netdev_init_one_queue(dev, queue, NULL);
6630 queue->qdisc = &noop_qdisc; 6630 RCU_INIT_POINTER(queue->qdisc, &noop_qdisc);
6631 queue->qdisc_sleeping = &noop_qdisc; 6631 queue->qdisc_sleeping = &noop_qdisc;
6632 rcu_assign_pointer(dev->ingress_queue, queue); 6632 rcu_assign_pointer(dev->ingress_queue, queue);
6633#endif 6633#endif