diff --git a/[refs] b/[refs] index e73a251b5f06..3db6ca9c9e12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b25d30bf112370a12d05c3c0fd43732985dab01 +refs/heads/master: 4839c52b01ca91be1c62761e08fb3deb3881e857 diff --git a/trunk/include/net/route.h b/trunk/include/net/route.h index 188b8936bb27..f7ce6259f86f 100644 --- a/trunk/include/net/route.h +++ b/trunk/include/net/route.h @@ -135,7 +135,7 @@ static inline void ip_rt_put(struct rtable * rt) #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) -extern __u8 ip_tos2prio[16]; +extern const __u8 ip_tos2prio[16]; static inline char rt_tos2priority(u8 tos) { diff --git a/trunk/net/ipv4/route.c b/trunk/net/ipv4/route.c index 85285021518b..88fa648d7ba3 100644 --- a/trunk/net/ipv4/route.c +++ b/trunk/net/ipv4/route.c @@ -167,7 +167,7 @@ static struct dst_ops ipv4_dst_ops = { #define ECN_OR_COST(class) TC_PRIO_##class -__u8 ip_tos2prio[16] = { +const __u8 ip_tos2prio[16] = { TC_PRIO_BESTEFFORT, ECN_OR_COST(FILLER), TC_PRIO_BESTEFFORT,