diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:54:02 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-01 01:54:02 -0500 |
commit | e538af42e416ac17368593370f7e1f5a71d55197 (patch) | |
tree | 507b90ccb700de4f564cc1a2def19658fe054a0c /net/ipv4/icmp.c | |
parent | 2226340eb8df9c42f9fca74582d08d5117fc0cec (diff) | |
parent | 5666c0947ede0432ba5148570aa66ffb9febff5b (diff) |
Merge branch 'master'
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r-- | net/ipv4/icmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index e3eceecd0496..92e23b2ad4d2 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c | |||
@@ -220,7 +220,7 @@ struct icmp_control { | |||
220 | short error; /* This ICMP is classed as an error message */ | 220 | short error; /* This ICMP is classed as an error message */ |
221 | }; | 221 | }; |
222 | 222 | ||
223 | static struct icmp_control icmp_pointers[NR_ICMP_TYPES+1]; | 223 | static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1]; |
224 | 224 | ||
225 | /* | 225 | /* |
226 | * The ICMP socket(s). This is the most convenient way to flow control | 226 | * The ICMP socket(s). This is the most convenient way to flow control |
@@ -994,7 +994,7 @@ error: | |||
994 | /* | 994 | /* |
995 | * This table is the definition of how we handle ICMP. | 995 | * This table is the definition of how we handle ICMP. |
996 | */ | 996 | */ |
997 | static struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = { | 997 | static const struct icmp_control icmp_pointers[NR_ICMP_TYPES + 1] = { |
998 | [ICMP_ECHOREPLY] = { | 998 | [ICMP_ECHOREPLY] = { |
999 | .output_entry = ICMP_MIB_OUTECHOREPS, | 999 | .output_entry = ICMP_MIB_OUTECHOREPS, |
1000 | .input_entry = ICMP_MIB_INECHOREPS, | 1000 | .input_entry = ICMP_MIB_INECHOREPS, |