Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6

[karo-tx-linux.git] / include / linux / capability.h

diff --git a/include/linux/capability.h b/include/linux/capability.h
index c42112350003d35bd7890b3a9023fe3161b79f27..a63d13d84ad8289efc8b4ceda7049441a0fd6f5b 100644 (file)
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
@@ -198,7 +198,7 @@ struct cpu_vfs_cap_data {
 /* Allow modification of routing tables */
 /* Allow setting arbitrary process / process group ownership on
    sockets */
-/* Allow binding to any address for transparent proxying */
+/* Allow binding to any address for transparent proxying (also via NET_RAW) */
 /* Allow setting TOS (type of service) */
 /* Allow setting promiscuous mode */
 /* Allow clearing driver statistics */
@@ -210,6 +210,7 @@ struct cpu_vfs_cap_data {
 
 /* Allow use of RAW sockets */
 /* Allow use of PACKET sockets */
+/* Allow binding to any address for transparent proxying (also via NET_ADMIN) */
 
 #define CAP_NET_RAW          13