From 2c06327112477e088879252e66456691cea3f665 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 17 Jun 2008 01:09:00 -0700
Subject: [PATCH] --- yaml --- r: 102987 b: refs/heads/master c:
 338db085518a8436cdecd33f7b52a06ec16d9ec1 h: refs/heads/master i:   102985:
 bb6d63d2ec0f10b9d777a23b76cc77474c950f6e   102983:
 e621f63f63108aefccd28efe5bb2c545e3384797 v: v3

---
 [refs]                   |  2 +-
 trunk/include/net/sock.h | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 41de25f5fd5e..84757993dea3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22196d3648581b253f927186b30075fb005287b0
+refs/heads/master: 338db085518a8436cdecd33f7b52a06ec16d9ec1
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 0a80961a83c0..83f74b11d09a 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -1331,30 +1331,6 @@ extern int net_msg_warn;
 #define LIMIT_NETDEBUG(fmt, args...) \
 	do { if (net_msg_warn && net_ratelimit()) printk(fmt,##args); } while(0)
 
-/*
- * Macros for sleeping on a socket. Use them like this:
- *
- * SOCK_SLEEP_PRE(sk)
- * if (condition)
- * 	schedule();
- * SOCK_SLEEP_POST(sk)
- *
- * N.B. These are now obsolete and were, afaik, only ever used in DECnet
- * and when the last use of them in DECnet has gone, I'm intending to
- * remove them.
- */
-
-#define SOCK_SLEEP_PRE(sk) 	{ struct task_struct *tsk = current; \
-				DECLARE_WAITQUEUE(wait, tsk); \
-				tsk->state = TASK_INTERRUPTIBLE; \
-				add_wait_queue((sk)->sk_sleep, &wait); \
-				release_sock(sk);
-
-#define SOCK_SLEEP_POST(sk)	tsk->state = TASK_RUNNING; \
-				remove_wait_queue((sk)->sk_sleep, &wait); \
-				lock_sock(sk); \
-				}
-
 extern __u32 sysctl_wmem_max;
 extern __u32 sysctl_rmem_max;