diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2005-06-23 12:20:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-06-23 12:20:36 -0700 |
| commit | 7c99c909fa69a183c1b80bd64fb9f0d11459aff3 (patch) | |
| tree | ab0d06458ca3b1f78945557022a3c2f5098ed614 /net | |
| parent | 317a76f9a44b437d6301718f4e5d08bd93f98da7 (diff) | |
| download | blackbird-op-linux-7c99c909fa69a183c1b80bd64fb9f0d11459aff3.tar.gz blackbird-op-linux-7c99c909fa69a183c1b80bd64fb9f0d11459aff3.zip | |
[TCP]: Change tcp_diag to use the existing __RTA_PUT() macro.
Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/tcp_diag.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c index 867acc0f79d8..a4e512036d88 100644 --- a/net/ipv4/tcp_diag.c +++ b/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; |
