---

yaml --- r: 278284 b: refs/heads/master c: 6977a79 h: refs/heads/master v: v3
git-mirror · Nov 29, 2011 · b4a0b9a · b4a0b9a
1 parent 0f3296e
commit b4a0b9a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bcc34bb987e07abcf6bc30b7f92fbf22b59d4ef
+refs/heads/master: 6977a79d36baf8b295b1893621874202e1d02094
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
@@ -2473,7 +2473,7 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
 #if IS_ENABLED(CONFIG_NETPRIO_CGROUP)
 static void skb_update_prio(struct sk_buff *skb)
 {
-	struct netprio_map *map = rcu_dereference(skb->dev->priomap);
+	struct netprio_map *map = rcu_dereference_bh(skb->dev->priomap);
 
 	if ((!skb->priority) && (skb->sk) && map)
 		skb->priority = map->priomap[skb->sk->sk_cgrp_prioidx];