From b4a0b9a320a58eb48509d45012c9113ff6973c9e Mon Sep 17 00:00:00 2001
From: Igor Maravic <igorm@etf.rs>
Date: Fri, 25 Nov 2011 07:44:54 +0000
Subject: [PATCH] --- yaml --- r: 278284 b: refs/heads/master c:
 6977a79d36baf8b295b1893621874202e1d02094 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8744d22a2d04..2b8f62635be4 100644
--- 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
index 91a599122074..278463e91e3a 100644
--- 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];