diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 06:29:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-03 06:29:43 -0400 |
| commit | f94f3cb37a1c4d44dd2070cc4a6165689bda9c92 (patch) | |
| tree | 21bbdeacbc1b9895cf917231d1675eaaa63b9229 /include/linux/sockios.h | |
| parent | e27808df97ff7b43b4927aadf410705f33313523 (diff) | |
| parent | 1b4610ebf37a05a65e9f29cdf4d87c207573104d (diff) | |
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'include/linux/sockios.h')
| -rw-r--r-- | include/linux/sockios.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/sockios.h b/include/linux/sockios.h index 241f179347d9..7997a506ad41 100644 --- a/include/linux/sockios.h +++ b/include/linux/sockios.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | /* Linux-specific socket ioctls */ | 23 | /* Linux-specific socket ioctls */ |
| 24 | #define SIOCINQ FIONREAD | 24 | #define SIOCINQ FIONREAD |
| 25 | #define SIOCOUTQ TIOCOUTQ | 25 | #define SIOCOUTQ TIOCOUTQ /* output queue size (not sent + not acked) */ |
| 26 | 26 | ||
| 27 | /* Routing table calls. */ | 27 | /* Routing table calls. */ |
| 28 | #define SIOCADDRT 0x890B /* add routing table entry */ | 28 | #define SIOCADDRT 0x890B /* add routing table entry */ |
| @@ -83,6 +83,8 @@ | |||
| 83 | 83 | ||
| 84 | #define SIOCWANDEV 0x894A /* get/set netdev parameters */ | 84 | #define SIOCWANDEV 0x894A /* get/set netdev parameters */ |
| 85 | 85 | ||
| 86 | #define SIOCOUTQNSD 0x894B /* output queue size (not sent only) */ | ||
| 87 | |||
| 86 | /* ARP cache control calls. */ | 88 | /* ARP cache control calls. */ |
| 87 | /* 0x8950 - 0x8952 * obsolete calls, don't re-use */ | 89 | /* 0x8950 - 0x8952 * obsolete calls, don't re-use */ |
| 88 | #define SIOCDARP 0x8953 /* delete ARP table entry */ | 90 | #define SIOCDARP 0x8953 /* delete ARP table entry */ |