---

yaml --- r: 256148 b: refs/heads/master c: 1cdebb4 h: refs/heads/master v: v3
git-mirror · Jul 7, 2011 · e88dc9d · e88dc9d
1 parent 08b94f7
commit e88dc9d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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)