From d423ffc0d319e43fc692087e54d6a18be5db4e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= <maze@google.com>
Date: Mon, 7 Nov 2011 14:23:11 +0000
Subject: [PATCH] --- yaml --- r: 275695 b: refs/heads/master c:
 06236ac3726f15124839cf16a9e2730a852dad9b h: refs/heads/master i:   275693:
 69bd487ac8a156d8ebdfe95e2551e5996c2fc791   275691:
 d5938d9db35aa22142963f4dc3656f90e5b96546   275687:
 a0547483e3dee05f4ac043aaf79af9b19844f3fc   275679:
 0d278dba94b5d78382fdbe568ececf2c01c0a04e v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/inet_diag.h | 3 ++-
 trunk/net/ipv4/inet_diag.c      | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index beae77da1b42..fb1f189df245 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d74eb9442fb113c97edc88a1c658462db711337
+refs/heads/master: 06236ac3726f15124839cf16a9e2730a852dad9b
diff --git a/trunk/include/linux/inet_diag.h b/trunk/include/linux/inet_diag.h
index 80b480c97532..abf5028db981 100644
--- a/trunk/include/linux/inet_diag.h
+++ b/trunk/include/linux/inet_diag.h
@@ -98,9 +98,10 @@ enum {
 	INET_DIAG_VEGASINFO,
 	INET_DIAG_CONG,
 	INET_DIAG_TOS,
+	INET_DIAG_TCLASS,
 };
 
-#define INET_DIAG_MAX INET_DIAG_TOS
+#define INET_DIAG_MAX INET_DIAG_TCLASS
 
 
 /* INET_DIAG_MEM */
diff --git a/trunk/net/ipv4/inet_diag.c b/trunk/net/ipv4/inet_diag.c
index f5e2bdaef949..68e8ac514383 100644
--- a/trunk/net/ipv4/inet_diag.c
+++ b/trunk/net/ipv4/inet_diag.c
@@ -133,8 +133,8 @@ static int inet_csk_diag_fill(struct sock *sk,
 			       &np->rcv_saddr);
 		ipv6_addr_copy((struct in6_addr *)r->id.idiag_dst,
 			       &np->daddr);
-		if (ext & (1 << (INET_DIAG_TOS - 1)))
-			RTA_PUT_U8(skb, INET_DIAG_TOS, np->tclass);
+		if (ext & (1 << (INET_DIAG_TCLASS - 1)))
+			RTA_PUT_U8(skb, INET_DIAG_TCLASS, np->tclass);
 	}
 #endif