From f4beb5f964aaf7a06f99d0b7b85cf8fb13f5bb63 Mon Sep 17 00:00:00 2001
From: John Fastabend <john.r.fastabend@intel.com>
Date: Fri, 25 Sep 2009 13:11:44 +0000
Subject: [PATCH] --- yaml --- r: 166557 b: refs/heads/master c:
 5dba93aedfc6906b27791c4a1136b177beae25b7 h: refs/heads/master i:   166555:
 9cbf7a3b1b3b563e9bbe519e671fc11011045c3b v: v3

---
 [refs]                         | 2 +-
 trunk/net/netlink/af_netlink.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cfcd225b8479..00d6fa7987d4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc482cc54e56bde012585905eb0f3565bec18ff5
+refs/heads/master: 5dba93aedfc6906b27791c4a1136b177beae25b7
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index a4bafbf15097..dd85320907cb 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -1788,7 +1788,7 @@ void netlink_ack(struct sk_buff *in_skb, struct nlmsghdr *nlh, int err)
 	}
 
 	rep = __nlmsg_put(skb, NETLINK_CB(in_skb).pid, nlh->nlmsg_seq,
-			  NLMSG_ERROR, sizeof(struct nlmsgerr), 0);
+			  NLMSG_ERROR, payload, 0);
 	errmsg = nlmsg_data(rep);
 	errmsg->error = err;
 	memcpy(&errmsg->msg, nlh, err ? nlh->nlmsg_len : sizeof(*nlh));