git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
linux
/
sockios.h
diff --git
a/include/linux/sockios.h
b/include/linux/sockios.h
index
e6b9d1d
..
abef759
100644
(file)
--- a/
include/linux/sockios.h
+++ b/
include/linux/sockios.h
@@
-72,8
+72,8
@@
#define SIOCGIFTXQLEN 0x8942 /* Get the tx queue length */
#define SIOCSIFTXQLEN 0x8943 /* Set the tx queue length */
#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 */
#define SIOCETHTOOL 0x8946 /* Ethtool interface */