diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:31:22 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-12 16:31:22 -0400 |
| commit | e1bd2ac5a6b7a8b625e40c9e9f8b6dea4cf22f85 (patch) | |
| tree | 9366e9fb481da2c7195ca3f2bafeffebbf001363 /net/ipx/ipx_proc.c | |
| parent | 0b9062f6b57a87f22309c6b920a51aaa66ce2a13 (diff) | |
| parent | 15028aad00ddf241581fbe74a02ec89cbb28d35d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (183 commits)
[TG3]: Update version to 3.78.
[TG3]: Add missing NVRAM strapping.
[TG3]: Enable auto MDI.
[TG3]: Fix the polarity bit.
[TG3]: Fix irq_sync race condition.
[NET_SCHED]: ematch: module autoloading
[TCP]: tcp probe wraparound handling and other changes
[RTNETLINK]: rtnl_link: allow specifying initial device address
[RTNETLINK]: rtnl_link API simplification
[VLAN]: Fix MAC address handling
[ETH]: Validate address in eth_mac_addr
[NET]: Fix races in net_rx_action vs netpoll.
[AF_UNIX]: Rewrite garbage collector, fixes race.
[NETFILTER]: {ip, nf}_conntrack_sctp: fix remotely triggerable NULL ptr dereference (CVE-2007-2876)
[NET]: Make all initialized struct seq_operations const.
[UDP]: Fix length check.
[IPV6]: Remove unneeded pointer idev from addrconf_cleanup().
[DECNET]: Another unnecessary net/tcp.h inclusion in net/dn.h
[IPV6]: Make IPV6_{RECV,2292}RTHDR boolean options.
[IPV6]: Do not send RH0 anymore.
...
Fixed up trivial conflict in Documentation/feature-removal-schedule.txt
manually.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ipx/ipx_proc.c')
| -rw-r--r-- | net/ipx/ipx_proc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c index db32ac8e79bd..4226e71ae1e3 100644 --- a/net/ipx/ipx_proc.c +++ b/net/ipx/ipx_proc.c | |||
| @@ -286,21 +286,21 @@ out: | |||
| 286 | return 0; | 286 | return 0; |
| 287 | } | 287 | } |
| 288 | 288 | ||
| 289 | static struct seq_operations ipx_seq_interface_ops = { | 289 | static const struct seq_operations ipx_seq_interface_ops = { |
| 290 | .start = ipx_seq_interface_start, | 290 | .start = ipx_seq_interface_start, |
| 291 | .next = ipx_seq_interface_next, | 291 | .next = ipx_seq_interface_next, |
| 292 | .stop = ipx_seq_interface_stop, | 292 | .stop = ipx_seq_interface_stop, |
| 293 | .show = ipx_seq_interface_show, | 293 | .show = ipx_seq_interface_show, |
| 294 | }; | 294 | }; |
| 295 | 295 | ||
| 296 | static struct seq_operations ipx_seq_route_ops = { | 296 | static const struct seq_operations ipx_seq_route_ops = { |
| 297 | .start = ipx_seq_route_start, | 297 | .start = ipx_seq_route_start, |
| 298 | .next = ipx_seq_route_next, | 298 | .next = ipx_seq_route_next, |
| 299 | .stop = ipx_seq_route_stop, | 299 | .stop = ipx_seq_route_stop, |
| 300 | .show = ipx_seq_route_show, | 300 | .show = ipx_seq_route_show, |
| 301 | }; | 301 | }; |
| 302 | 302 | ||
| 303 | static struct seq_operations ipx_seq_socket_ops = { | 303 | static const struct seq_operations ipx_seq_socket_ops = { |
| 304 | .start = ipx_seq_socket_start, | 304 | .start = ipx_seq_socket_start, |
| 305 | .next = ipx_seq_socket_next, | 305 | .next = ipx_seq_socket_next, |
| 306 | .stop = ipx_seq_interface_stop, | 306 | .stop = ipx_seq_interface_stop, |