From 9fc469460ec85c8547d2ebe629212c9a92531e04 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Fri, 24 Mar 2006 15:12:37 -0800
Subject: [PATCH] --- yaml --- r: 23659 b: refs/heads/master c:
 9932cf954691f20d548cd6010d89d1d48597e104 h: refs/heads/master i:   23657:
 5564bf85c0703ae26cb4310ea6d5e3410c442a5f   23655:
 3ed5017487bb05b61571e32aa75870261c44042f v: v3

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

diff --git a/[refs] b/[refs]
index cea928840eb9..748a0fba5f40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f67ed26f2b3e92c0450deae3ffc3fff21c878a75
+refs/heads/master: 9932cf954691f20d548cd6010d89d1d48597e104
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index ec226f31dc2a..2aa73c0ec6c2 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -210,6 +210,7 @@ struct sock {
 	gfp_t			sk_allocation;
 	int			sk_sndbuf;
 	int			sk_route_caps;
+	int			sk_rcvlowat;
 	unsigned long 		sk_flags;
 	unsigned long	        sk_lingertime;
 	/*
@@ -230,7 +231,6 @@ struct sock {
 	unsigned short		sk_max_ack_backlog;
 	__u32			sk_priority;
 	struct ucred		sk_peercred;
-	int			sk_rcvlowat;
 	long			sk_rcvtimeo;
 	long			sk_sndtimeo;
 	struct sk_filter      	*sk_filter;