memcg: some modification to softlimit under hierarchical memory reclaim.

[safe/jmp/linux-2.6] / include / linux / sockios.h

diff --git a/include/linux/sockios.h b/include/linux/sockios.h
index 5eb3320..241f179 100644 (file)
--- a/include/linux/sockios.h
+++ b/include/linux/sockios.h
@@ -7,7 +7,7 @@
  *
  * Version:    @(#)sockios.h   1.0.2   03/09/93
  *
- * Authors:    Ross Biro, <bir7@leland.Stanford.Edu>
+ * Authors:    Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *
  *             This program is free software; you can redistribute it and/or
@@ -72,8 +72,8 @@
 #define SIOCGIFTXQLEN  0x8942          /* Get the tx queue length      */
 #define SIOCSIFTXQLEN  0x8943          /* Set the tx queue length      */
 
-#define SIOCGIFDIVERT  0x8944          /* Frame diversion support */
-#define SIOCSIFDIVERT  0x8945          /* Set frame diversion options */
+/* SIOCGIFDIVERT was:  0x8944          Frame diversion support */
+/* SIOCSIFDIVERT was:  0x8945          Set frame diversion options */
 
 #define SIOCETHTOOL    0x8946          /* Ethtool interface            */
 
@@ -122,6 +122,9 @@
 #define SIOCBRADDIF    0x89a2          /* add interface to bridge      */
 #define SIOCBRDELIF    0x89a3          /* remove interface from bridge */
 
+/* hardware time stamping: parameters in linux/net_tstamp.h */
+#define SIOCSHWTSTAMP   0x89b0
+
 /* Device private ioctl calls */
 
 /*