From 8d5f24b84896a7ec6cdf459464ce0559e68299d9 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 13 Oct 2011 14:00:06 -0400
Subject: [PATCH] --- yaml --- r: 266671 b: refs/heads/master c:
 97ba0eb64ca690165f945a83e609102fcefa99cb h: refs/heads/master i:   266669:
 5c52e7a65580ad56cfacb58f232b10b6de619598   266667:
 2ca54dd8f55d4dd41c6e9593957b79b3933b8545   266663:
 7190692f0c0193df13c20eb45f2643dbd43ae384   266655:
 97e97d53f720842db2cc8c6d1cd6b53147a5c298 v: v3

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

diff --git a/[refs] b/[refs]
index 18a8f64f5440..bf8c8eb69faa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a28dc43f1d8dfc4fe61c9b9505c1b902285c96b8
+refs/heads/master: 97ba0eb64ca690165f945a83e609102fcefa99cb
diff --git a/trunk/include/linux/inet_diag.h b/trunk/include/linux/inet_diag.h
index bc8c49022084..80b480c97532 100644
--- a/trunk/include/linux/inet_diag.h
+++ b/trunk/include/linux/inet_diag.h
@@ -97,9 +97,10 @@ enum {
 	INET_DIAG_INFO,
 	INET_DIAG_VEGASINFO,
 	INET_DIAG_CONG,
+	INET_DIAG_TOS,
 };
 
-#define INET_DIAG_MAX INET_DIAG_CONG
+#define INET_DIAG_MAX INET_DIAG_TOS
 
 
 /* INET_DIAG_MEM */
diff --git a/trunk/net/ipv4/cipso_ipv4.c b/trunk/net/ipv4/cipso_ipv4.c
index 2c2a98e402e7..86f3b885b4f3 100644
--- a/trunk/net/ipv4/cipso_ipv4.c
+++ b/trunk/net/ipv4/cipso_ipv4.c
@@ -476,7 +476,7 @@ int cipso_v4_doi_add(struct cipso_v4_doi *doi_def,
 	doi = doi_def->doi;
 	doi_type = doi_def->type;
 
-	if (doi_def == NULL || doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
+	if (doi_def->doi == CIPSO_V4_DOI_UNKNOWN)
 		goto doi_add_return;
 	for (iter = 0; iter < CIPSO_V4_TAG_MAXCNT; iter++) {
 		switch (doi_def->tags[iter]) {
diff --git a/trunk/net/ipv4/inet_diag.c b/trunk/net/ipv4/inet_diag.c
index 389a2e6a17fd..f5e2bdaef949 100644
--- a/trunk/net/ipv4/inet_diag.c
+++ b/trunk/net/ipv4/inet_diag.c
@@ -108,6 +108,9 @@ static int inet_csk_diag_fill(struct sock *sk,
 		       icsk->icsk_ca_ops->name);
 	}
 
+	if ((ext & (1 << (INET_DIAG_TOS - 1))) && (sk->sk_family != AF_INET6))
+		RTA_PUT_U8(skb, INET_DIAG_TOS, inet->tos);
+
 	r->idiag_family = sk->sk_family;
 	r->idiag_state = sk->sk_state;
 	r->idiag_timer = 0;
@@ -130,6 +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);
 	}
 #endif