From 2d8e31c532500766216964ee066eb67b4efce35f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 26 Jun 2012 21:51:35 -0700
Subject: [PATCH] --- yaml --- r: 314654 b: refs/heads/master c:
 c3deafc5261a9421b315ee0d0e8e36ba7857128c h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/netlink.h | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ab287a041aca..857acf2ed608 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02ef22ca4044fe90867f77cba720e4a442122826
+refs/heads/master: c3deafc5261a9421b315ee0d0e8e36ba7857128c
diff --git a/trunk/include/linux/netlink.h b/trunk/include/linux/netlink.h
index 0f628ffa420c..ed33f0901bc2 100644
--- a/trunk/include/linux/netlink.h
+++ b/trunk/include/linux/netlink.h
@@ -241,14 +241,6 @@ struct netlink_notify {
 struct nlmsghdr *
 __nlmsg_put(struct sk_buff *skb, u32 pid, u32 seq, int type, int len, int flags);
 
-#define NLMSG_NEW(skb, pid, seq, type, len, flags) \
-({	if (unlikely(skb_tailroom(skb) < (int)NLMSG_SPACE(len))) \
-		goto nlmsg_failure; \
-	__nlmsg_put(skb, pid, seq, type, len, flags); })
-
-#define NLMSG_PUT(skb, pid, seq, type, len) \
-	NLMSG_NEW(skb, pid, seq, type, len, 0)
-
 struct netlink_dump_control {
 	int (*dump)(struct sk_buff *skb, struct netlink_callback *);
 	int (*done)(struct netlink_callback*);