diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 16:24:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-13 16:24:01 -0700 |
| commit | 814d8ffd5009e13f1266759b583ef847c5350d77 (patch) | |
| tree | 00b01e4ccac6ba82ab5e67c27103f6f75f8ccf9d /include/linux | |
| parent | 386bfcf5e8a3c34d92156c945c8db58a1e2f7c69 (diff) | |
| parent | 1c2fb7f93cb20621772bf304f3dba0849942e5db (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/if_tr.h | 2 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/if_tr.h b/include/linux/if_tr.h index 6688b414c529..3fba9e2f5427 100644 --- a/include/linux/if_tr.h +++ b/include/linux/if_tr.h @@ -19,6 +19,8 @@ #ifndef _LINUX_IF_TR_H #define _LINUX_IF_TR_H +#include <asm/byteorder.h> /* For __be16 */ + /* IEEE 802.5 Token-Ring magic constants. The frame sizes omit the preamble and FCS/CRC (frame check sequence). */ #define TR_ALEN 6 /* Octets in one token-ring addr */ diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 23032d9d6071..a17745c80a91 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -346,6 +346,7 @@ enum NET_TCP_MODERATE_RCVBUF=106, NET_TCP_TSO_WIN_DIVISOR=107, NET_TCP_BIC_BETA=108, + NET_IPV4_ICMP_ERRORS_USE_INBOUND_IFADDR=109, }; enum { |