From 11e2dca01b1520a0707b4a74d893f48c8c1ab2a9 Mon Sep 17 00:00:00 2001 From: Alexey Dobriyan Date: Fri, 22 Jan 2010 10:18:25 +0000 Subject: [PATCH] --- yaml --- r: 183729 b: refs/heads/master c: e754834e65220b2b674c55c3b6dfb2fb1a2804d0 h: refs/heads/master i: 183727: 45b8d6329b27d8965b5e44e5b3fd49cd54377d86 v: v3 --- [refs] | 2 +- trunk/include/net/icmp.h | 2 +- trunk/net/ipv4/icmp.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b4458d9587af..1651fc0cf936 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5833929cc2ad2b3064b4fac8c44e293972d240d8 +refs/heads/master: e754834e65220b2b674c55c3b6dfb2fb1a2804d0 diff --git a/trunk/include/net/icmp.h b/trunk/include/net/icmp.h index dfa72d4e8907..15b3dfe9fce8 100644 --- a/trunk/include/net/icmp.h +++ b/trunk/include/net/icmp.h @@ -28,7 +28,7 @@ struct icmp_err { unsigned fatal:1; }; -extern struct icmp_err icmp_err_convert[]; +extern const struct icmp_err icmp_err_convert[]; #define ICMP_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.icmp_statistics, field) #define ICMP_INC_STATS_BH(net, field) SNMP_INC_STATS_BH((net)->mib.icmp_statistics, field) #define ICMPMSGOUT_INC_STATS(net, field) SNMP_INC_STATS((net)->mib.icmpmsg_statistics, field+256) diff --git a/trunk/net/ipv4/icmp.c b/trunk/net/ipv4/icmp.c index fe11f60ce41b..4b4c2bcd15db 100644 --- a/trunk/net/ipv4/icmp.c +++ b/trunk/net/ipv4/icmp.c @@ -114,7 +114,7 @@ struct icmp_bxm { /* An array of errno for error messages from dest unreach. */ /* RFC 1122: 3.2.2.1 States that NET_UNREACH, HOST_UNREACH and SR_FAILED MUST be considered 'transient errs'. */ -struct icmp_err icmp_err_convert[] = { +const struct icmp_err icmp_err_convert[] = { { .errno = ENETUNREACH, /* ICMP_NET_UNREACH */ .fatal = 0,