From e2aef6c19567182f743489766bb57df4e9588c72 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 23 Jun 2005 12:20:36 -0700
Subject: [PATCH] --- yaml --- r: 3017 b: refs/heads/master c:
 7c99c909fa69a183c1b80bd64fb9f0d11459aff3 h: refs/heads/master i:   3015:
 98d3c928df29631f82c7839da611ef41b666f674 v: v3

---
 [refs]                    | 2 +-
 trunk/net/ipv4/tcp_diag.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index ac478a06874e..399b5024e36a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 317a76f9a44b437d6301718f4e5d08bd93f98da7
+refs/heads/master: 7c99c909fa69a183c1b80bd64fb9f0d11459aff3
diff --git a/trunk/net/ipv4/tcp_diag.c b/trunk/net/ipv4/tcp_diag.c
index 867acc0f79d8..a4e512036d88 100644
--- a/trunk/net/ipv4/tcp_diag.c
+++ b/trunk/net/ipv4/tcp_diag.c
@@ -43,13 +43,7 @@ struct tcpdiag_entry
 static struct sock *tcpnl;
 
 #define TCPDIAG_PUT(skb, attrtype, attrlen) \
-({ int rtalen = RTA_LENGTH(attrlen);        \
-   struct rtattr *rta;                      \
-   if (skb_tailroom(skb) < RTA_ALIGN(rtalen)) goto nlmsg_failure; \
-   rta = (void*)__skb_put(skb, RTA_ALIGN(rtalen)); \
-   rta->rta_type = attrtype;                \
-   rta->rta_len = rtalen;                   \
-   RTA_DATA(rta); })
+	RTA_DATA(__RTA_PUT(skb, attrtype, attrlen))
 
 static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
 			int ext, u32 pid, u32 seq, u16 nlmsg_flags)
@@ -167,6 +161,7 @@ static int tcpdiag_fill(struct sk_buff *skb, struct sock *sk,
 	nlh->nlmsg_len = skb->tail - b;
 	return skb->len;
 
+rtattr_failure:
 nlmsg_failure:
 	skb_trim(skb, b - skb->data);
 	return -1;