From e88dc9d5b131fbd131f9d567978b8570707b18b1 Mon Sep 17 00:00:00 2001
From: Shirley Ma <mashirle@us.ibm.com>
Date: Wed, 6 Jul 2011 12:17:30 +0000
Subject: [PATCH] --- yaml --- r: 256148 b: refs/heads/master c:
 1cdebb423202e255366a321814fc6df079802a0d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 781e2516046f..af7c6801a8f0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 380b153cf59a5610ca97319fdb9601b8c453ece0
+refs/heads/master: 1cdebb423202e255366a321814fc6df079802a0d
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index ae56da6ec958..396f735e0cd5 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -563,6 +563,7 @@ enum sock_flags {
 	SOCK_TIMESTAMPING_SYS_HARDWARE, /* %SOF_TIMESTAMPING_SYS_HARDWARE */
 	SOCK_FASYNC, /* fasync() active */
 	SOCK_RXQ_OVFL,
+	SOCK_ZEROCOPY, /* buffers from userspace */
 };
 
 static inline void sock_copy_flags(struct sock *nsk, struct sock *osk)