diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:31:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-21 12:31:48 -0500 |
| commit | 3d1f337b3e7378923c89f37afb573a918ef40be5 (patch) | |
| tree | 386798378567a10d1c7b24f599cb50f70298694c /net/ipv4/sysctl_net_ipv4.c | |
| parent | 2bf2154c6bb5599e3ec3f73c34861a0b12aa839e (diff) | |
| parent | 5e35941d990123f155b02d5663e51a24f816b6f3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
[NETFILTER]: Add H.323 conntrack/NAT helper
[TG3]: Don't mark tg3_test_registers() as returning const.
[IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
[IPV6]: Nearly complete kzalloc cleanup for net/ipv6
[IPV6]: Cleanup of net/ipv6/reassambly.c
[BRIDGE]: Remove duplicate const from is_link_local() argument type.
[DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
[TG3]: make drivers/net/tg3.c:tg3_request_irq() static
[BRIDGE]: use LLC to send STP
[LLC]: llc_mac_hdr_init const arguments
[BRIDGE]: allow show/store of group multicast address
[BRIDGE]: use llc for receiving STP packets
[BRIDGE]: stp timer to jiffies cleanup
[BRIDGE]: forwarding remove unneeded preempt and bh diasables
[BRIDGE]: netfilter inline cleanup
[BRIDGE]: netfilter VLAN macro cleanup
[BRIDGE]: netfilter dont use __constant_htons
[BRIDGE]: netfilter whitespace
[BRIDGE]: optimize frame pass up
[BRIDGE]: use kzalloc
...
Diffstat (limited to 'net/ipv4/sysctl_net_ipv4.c')
| -rw-r--r-- | net/ipv4/sysctl_net_ipv4.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 16984d4a8a06..6b6c3adfcf00 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c | |||
| @@ -664,7 +664,30 @@ ctl_table ipv4_table[] = { | |||
| 664 | .mode = 0644, | 664 | .mode = 0644, |
| 665 | .proc_handler = &proc_dointvec, | 665 | .proc_handler = &proc_dointvec, |
| 666 | }, | 666 | }, |
| 667 | 667 | { | |
| 668 | .ctl_name = NET_TCP_MTU_PROBING, | ||
| 669 | .procname = "tcp_mtu_probing", | ||
| 670 | .data = &sysctl_tcp_mtu_probing, | ||
| 671 | .maxlen = sizeof(int), | ||
| 672 | .mode = 0644, | ||
| 673 | .proc_handler = &proc_dointvec, | ||
| 674 | }, | ||
| 675 | { | ||
| 676 | .ctl_name = NET_TCP_BASE_MSS, | ||
| 677 | .procname = "tcp_base_mss", | ||
| 678 | .data = &sysctl_tcp_base_mss, | ||
| 679 | .maxlen = sizeof(int), | ||
| 680 | .mode = 0644, | ||
| 681 | .proc_handler = &proc_dointvec, | ||
| 682 | }, | ||
| 683 | { | ||
| 684 | .ctl_name = NET_IPV4_TCP_WORKAROUND_SIGNED_WINDOWS, | ||
| 685 | .procname = "tcp_workaround_signed_windows", | ||
| 686 | .data = &sysctl_tcp_workaround_signed_windows, | ||
| 687 | .maxlen = sizeof(int), | ||
| 688 | .mode = 0644, | ||
| 689 | .proc_handler = &proc_dointvec | ||
| 690 | }, | ||
| 668 | { .ctl_name = 0 } | 691 | { .ctl_name = 0 } |
| 669 | }; | 692 | }; |
| 670 | 693 | ||