From c4021e59b5cd23a83fb0e756134ded8481f09ecf Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 12 Mar 2006 20:34:27 -0800
Subject: [PATCH] --- yaml --- r: 21019 b: refs/heads/master c:
 cc9a06cd8d6fbb69b4d3c46760c132cfe312fb85 h: refs/heads/master i:   21017:
 2d8c376d7c27bf4bee18659f8462a5b021b6e101   21015:
 a8f361f6d8e22d8fef9912fb2b663e358e0f7200 v: v3

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

diff --git a/[refs] b/[refs]
index cc20b8b6ba1c..8077c3e135fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8dc01f543f28253abeef649987249210d8db3cc
+refs/heads/master: cc9a06cd8d6fbb69b4d3c46760c132cfe312fb85
diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c
index 6b9772d95872..59dc7d140600 100644
--- a/trunk/net/netlink/af_netlink.c
+++ b/trunk/net/netlink/af_netlink.c
@@ -1194,6 +1194,9 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,
 		msg->msg_namelen = sizeof(*addr);
 	}
 
+	if (nlk->flags & NETLINK_RECV_PKTINFO)
+		netlink_cmsg_recv_pktinfo(msg, skb);
+
 	if (NULL == siocb->scm) {
 		memset(&scm, 0, sizeof(scm));
 		siocb->scm = &scm;
@@ -1205,8 +1208,6 @@ static int netlink_recvmsg(struct kiocb *kiocb, struct socket *sock,
 		netlink_dump(sk);
 
 	scm_recv(sock, msg, siocb->scm, flags);
-	if (nlk->flags & NETLINK_RECV_PKTINFO)
-		netlink_cmsg_recv_pktinfo(msg, skb);
 
 out:
 	netlink_rcv_wake(sk);