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/ax25 | |
| 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/ax25')
| -rw-r--r-- | net/ax25/af_ax25.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_route.c | 2 | ||||
| -rw-r--r-- | net/ax25/ax25_uid.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c index 429e13a6c6ad..c83cf8432970 100644 --- a/net/ax25/af_ax25.c +++ b/net/ax25/af_ax25.c | |||
| @@ -1924,7 +1924,7 @@ static int ax25_info_show(struct seq_file *seq, void *v) | |||
| 1924 | return 0; | 1924 | return 0; |
| 1925 | } | 1925 | } |
| 1926 | 1926 | ||
| 1927 | static struct seq_operations ax25_info_seqops = { | 1927 | static const struct seq_operations ax25_info_seqops = { |
| 1928 | .start = ax25_info_start, | 1928 | .start = ax25_info_start, |
| 1929 | .next = ax25_info_next, | 1929 | .next = ax25_info_next, |
| 1930 | .stop = ax25_info_stop, | 1930 | .stop = ax25_info_stop, |
diff --git a/net/ax25/ax25_route.c b/net/ax25/ax25_route.c index d65b8e22868d..9ecf6f1df863 100644 --- a/net/ax25/ax25_route.c +++ b/net/ax25/ax25_route.c | |||
| @@ -320,7 +320,7 @@ static int ax25_rt_seq_show(struct seq_file *seq, void *v) | |||
| 320 | return 0; | 320 | return 0; |
| 321 | } | 321 | } |
| 322 | 322 | ||
| 323 | static struct seq_operations ax25_rt_seqops = { | 323 | static const struct seq_operations ax25_rt_seqops = { |
| 324 | .start = ax25_rt_seq_start, | 324 | .start = ax25_rt_seq_start, |
| 325 | .next = ax25_rt_seq_next, | 325 | .next = ax25_rt_seq_next, |
| 326 | .stop = ax25_rt_seq_stop, | 326 | .stop = ax25_rt_seq_stop, |
diff --git a/net/ax25/ax25_uid.c b/net/ax25/ax25_uid.c index 75c76647b2cb..ce0b13d44385 100644 --- a/net/ax25/ax25_uid.c +++ b/net/ax25/ax25_uid.c | |||
| @@ -185,7 +185,7 @@ static int ax25_uid_seq_show(struct seq_file *seq, void *v) | |||
| 185 | return 0; | 185 | return 0; |
| 186 | } | 186 | } |
| 187 | 187 | ||
| 188 | static struct seq_operations ax25_uid_seqops = { | 188 | static const struct seq_operations ax25_uid_seqops = { |
| 189 | .start = ax25_uid_seq_start, | 189 | .start = ax25_uid_seq_start, |
| 190 | .next = ax25_uid_seq_next, | 190 | .next = ax25_uid_seq_next, |
| 191 | .stop = ax25_uid_seq_stop, | 191 | .stop = ax25_uid_seq_stop, |