diff options
| author | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-07 23:03:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.osdl.org> | 2004-02-07 23:03:49 -0800 |
| commit | b426ad96a1946660477db24a3db38ce868dad028 (patch) | |
| tree | e0f52cf1b7ee10eb3dd163290a8f8096e7dd4e3c /include/linux | |
| parent | de6d71e900c5179e086723a842f33b64dd3ce721 (diff) | |
| parent | d7f7f76773c53378ce631d9b0e46a46c11ddcbaa (diff) | |
Merge bk://linux-pnp.bkbits.net/pnp-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipv6.h | 2 | ||||
| -rw-r--r-- | include/linux/sysctl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index ab97fc520921..29911bf4218e 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -185,7 +185,6 @@ struct inet6_skb_parm int iif; __u16 ra; __u16 hop; - __u16 auth; __u16 dst0; __u16 srcrt; __u16 dst1; @@ -211,7 +210,6 @@ struct ipv6_pinfo { rxhlim:1, hopopts:1, dstopts:1, - authhdr:1, rxflow:1; } bits; __u8 all; diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 935be9d21b69..dc4167a0dbf2 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h @@ -583,6 +583,8 @@ enum { NET_SCTP_PRESERVE_ENABLE = 11, NET_SCTP_MAX_BURST = 12, NET_SCTP_ADDIP_ENABLE = 13, + NET_SCTP_RMEM = 14, + NET_SCTP_WMEM = 15, }; /* /proc/sys/net/bridge */ |