o ipv6/icmp: use C99 struct style init for tab_unreach

96655561 · Arnaldo Carvalho de Melo · 1c320830 · 96655561
Commit 96655561 authored May 17, 2003 by Arnaldo Carvalho de Melo
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 5 deletions

net/ipv6/icmp.c net/ipv6/icmp.c +20 -5

No files found.
--- a/net/ipv6/icmp.c
+++ b/net/ipv6/icmp.c
@@ -737,11 +737,26 @@ static struct icmp6_err {
 	int err;
 	int fatal;
 } tab_unreach[] = {
-	{ ENETUNREACH,	0},	/* NOROUTE		*/
+	{	/* NOROUTE */
-	{ EACCES,	1},	/* ADM_PROHIBITED	*/
+		.err	= ENETUNREACH,
-	{ EHOSTUNREACH,	0},	/* Was NOT_NEIGHBOUR, now reserved */
+		.fatal	= 0,
-	{ EHOSTUNREACH,	0},	/* ADDR_UNREACH		*/
+	},
-	{ ECONNREFUSED,	1},	/* PORT_UNREACH		*/
+	{	/* ADM_PROHIBITED */
+		.err	= EACCES,
+		.fatal	= 1,
+	},
+	{	/* Was NOT_NEIGHBOUR, now reserved */
+		.err	= EHOSTUNREACH,
+		.fatal	= 0,
+	},
+	{	/* ADDR_UNREACH	*/
+		.err	= EHOSTUNREACH,
+		.fatal	= 0,
+	},
+	{	/* PORT_UNREACH	*/
+		.err	= ECONNREFUSED,
+		.fatal	= 1,
+	},
 };
 int icmpv6_err_convert(int type, int code, int *err)