net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct

[deliverable/linux.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index e5c395473eba800fb9fe7839ffdc19756d898263..8f705fcedb94b0e4ef56cdf70b363fdd396a14ee 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2929,7 +2929,8 @@ static void skb_update_prio(struct sk_buff *skb)
        struct netprio_map *map = rcu_dereference_bh(skb->dev->priomap);
 
        if (!skb->priority && skb->sk && map) {
-               unsigned int prioidx = skb->sk->sk_cgrp_prioidx;
+               unsigned int prioidx =
+                       sock_cgroup_prioidx(&skb->sk->sk_cgrp_data);
 
                if (prioidx < map->priomap_len)
                        skb->priority = map->priomap[prioidx];