o ipv6/exthdrs: use C99 struct init style.

parent a8e533ac
...@@ -54,10 +54,9 @@ ...@@ -54,10 +54,9 @@
* It MUST NOT touch skb->h. * It MUST NOT touch skb->h.
*/ */
struct tlvtype_proc struct tlvtype_proc {
{
int type; int type;
int (*func) (struct sk_buff *, int offset); int (*func)(struct sk_buff *skb, int offset);
}; };
/********************* /*********************
...@@ -175,8 +174,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp, unsigned int *nhoffp) ...@@ -175,8 +174,7 @@ static int ipv6_destopt_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
return -1; return -1;
} }
static struct inet6_protocol destopt_protocol = static struct inet6_protocol destopt_protocol = {
{
.handler = ipv6_destopt_rcv, .handler = ipv6_destopt_rcv,
.flags = INET6_PROTO_NOPOLICY, .flags = INET6_PROTO_NOPOLICY,
}; };
...@@ -199,8 +197,7 @@ static int ipv6_nodata_rcv(struct sk_buff **skbp, unsigned int *nhoffp) ...@@ -199,8 +197,7 @@ static int ipv6_nodata_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
return 0; return 0;
} }
static struct inet6_protocol nodata_protocol = static struct inet6_protocol nodata_protocol = {
{
.handler = ipv6_nodata_rcv, .handler = ipv6_nodata_rcv,
.flags = INET6_PROTO_NOPOLICY, .flags = INET6_PROTO_NOPOLICY,
}; };
...@@ -328,8 +325,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp, unsigned int *nhoffp) ...@@ -328,8 +325,7 @@ static int ipv6_rthdr_rcv(struct sk_buff **skbp, unsigned int *nhoffp)
return -1; return -1;
} }
static struct inet6_protocol rthdr_protocol = static struct inet6_protocol rthdr_protocol = {
{
.handler = ipv6_rthdr_rcv, .handler = ipv6_rthdr_rcv,
.flags = INET6_PROTO_NOPOLICY, .flags = INET6_PROTO_NOPOLICY,
}; };
...@@ -462,9 +458,15 @@ static int ipv6_hop_jumbo(struct sk_buff *skb, int optoff) ...@@ -462,9 +458,15 @@ static int ipv6_hop_jumbo(struct sk_buff *skb, int optoff)
} }
static struct tlvtype_proc tlvprochopopt_lst[] = { static struct tlvtype_proc tlvprochopopt_lst[] = {
{IPV6_TLV_ROUTERALERT, ipv6_hop_ra}, {
{IPV6_TLV_JUMBO, ipv6_hop_jumbo}, .type = IPV6_TLV_ROUTERALERT,
{-1, NULL} .func = ipv6_hop_ra,
},
{
.type = IPV6_TLV_JUMBO,
.func = ipv6_hop_jumbo,
},
{ -1, }
}; };
int ipv6_parse_hopopts(struct sk_buff *skb, int nhoff) int ipv6_parse_hopopts(struct sk_buff *skb, int nhoff)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment