Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94729f8a authored by Mark Rustad's avatar Mark Rustad Committed by Jozsef Kadlecsik
Browse files

netfilter: ipset: Resolve missing-field-initializer warnings 



Resolve missing-field-initializer warnings by providing a
directed initializer.

Signed-off-by: default avatarMark Rustad <mark.d.rustad@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
parent 6e41ee68

net/netfilter/ipset/ip_set_bitmap_ip.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ bitmap_ip_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

{

	struct bitmap_ip *map = set->data;

	struct bitmap_ip *map = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct bitmap_ip_adt_elem e = { };

	struct bitmap_ip_adt_elem e = { .id = 0 };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	u32 ip;

	u32 ip;
@@ -132,7 +132,7 @@ bitmap_ip_uadt(struct ip_set *set, struct nlattr *tb[], 
	struct bitmap_ip *map = set->data;

	struct bitmap_ip *map = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	u32 ip = 0, ip_to = 0;

	u32 ip = 0, ip_to = 0;

	struct bitmap_ip_adt_elem e = { };

	struct bitmap_ip_adt_elem e = { .id = 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	int ret = 0;

	int ret = 0;

net/netfilter/ipset/ip_set_bitmap_ipmac.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -203,7 +203,7 @@ bitmap_ipmac_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

{

	struct bitmap_ipmac *map = set->data;

	struct bitmap_ipmac *map = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct bitmap_ipmac_adt_elem e = {};

	struct bitmap_ipmac_adt_elem e = { .id = 0 };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	u32 ip;

	u32 ip;
@@ -232,7 +232,7 @@ bitmap_ipmac_uadt(struct ip_set *set, struct nlattr *tb[], 
{

{

	const struct bitmap_ipmac *map = set->data;

	const struct bitmap_ipmac *map = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct bitmap_ipmac_adt_elem e = {};

	struct bitmap_ipmac_adt_elem e = { .id = 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	u32 ip = 0;

	u32 ip = 0;

	int ret = 0;

	int ret = 0;

net/netfilter/ipset/ip_set_bitmap_port.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -104,7 +104,7 @@ bitmap_port_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

{

	struct bitmap_port *map = set->data;

	struct bitmap_port *map = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct bitmap_port_adt_elem e = {};

	struct bitmap_port_adt_elem e = { .id = 0 };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	__be16 __port;

	__be16 __port;

	u16 port = 0;

	u16 port = 0;
@@ -129,7 +129,7 @@ bitmap_port_uadt(struct ip_set *set, struct nlattr *tb[], 
{

{

	struct bitmap_port *map = set->data;

	struct bitmap_port *map = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct bitmap_port_adt_elem e = {};

	struct bitmap_port_adt_elem e = { .id = 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	u32 port;	/* wraparound */

	u32 port;	/* wraparound */

	u16 port_to;

	u16 port_to;

net/netfilter/ipset/ip_set_hash_ip.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ hash_ip4_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

{

	const struct hash_ip *h = set->data;

	const struct hash_ip *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip4_elem e = {};

	struct hash_ip4_elem e = { 0 };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	__be32 ip;

	__be32 ip;
@@ -103,7 +103,7 @@ hash_ip4_uadt(struct ip_set *set, struct nlattr *tb[], 
{

{

	const struct hash_ip *h = set->data;

	const struct hash_ip *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip4_elem e = {};

	struct hash_ip4_elem e = { 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	u32 ip = 0, ip_to = 0, hosts;

	u32 ip = 0, ip_to = 0, hosts;

	int ret = 0;

	int ret = 0;
@@ -222,7 +222,7 @@ hash_ip6_kadt(struct ip_set *set, const struct sk_buff *skb, 
{

{

	const struct hash_ip *h = set->data;

	const struct hash_ip *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip6_elem e = {};

	struct hash_ip6_elem e = { { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);





	ip6addrptr(skb, opt->flags & IPSET_DIM_ONE_SRC, &e.ip.in6);

	ip6addrptr(skb, opt->flags & IPSET_DIM_ONE_SRC, &e.ip.in6);
@@ -239,7 +239,7 @@ hash_ip6_uadt(struct ip_set *set, struct nlattr *tb[], 
{

{

	const struct hash_ip *h = set->data;

	const struct hash_ip *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ip6_elem e = {};

	struct hash_ip6_elem e = { { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	int ret;

	int ret;

net/netfilter/ipset/ip_set_hash_ipport.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -94,7 +94,7 @@ hash_ipport4_kadt(struct ip_set *set, const struct sk_buff *skb, 
		  enum ipset_adt adt, struct ip_set_adt_opt *opt)

		  enum ipset_adt adt, struct ip_set_adt_opt *opt)

{

{

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport4_elem e = { };

	struct hash_ipport4_elem e = { .ip = 0 };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);





	if (!ip_set_get_ip4_port(skb, opt->flags & IPSET_DIM_TWO_SRC,

	if (!ip_set_get_ip4_port(skb, opt->flags & IPSET_DIM_TWO_SRC,
@@ -111,7 +111,7 @@ hash_ipport4_uadt(struct ip_set *set, struct nlattr *tb[], 
{

{

	const struct hash_ipport *h = set->data;

	const struct hash_ipport *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport4_elem e = { };

	struct hash_ipport4_elem e = { .ip = 0 };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	u32 ip, ip_to = 0, p = 0, port, port_to;

	u32 ip, ip_to = 0, p = 0, port, port_to;

	bool with_ports = false;

	bool with_ports = false;
@@ -258,7 +258,7 @@ hash_ipport6_kadt(struct ip_set *set, const struct sk_buff *skb, 
		  enum ipset_adt adt, struct ip_set_adt_opt *opt)

		  enum ipset_adt adt, struct ip_set_adt_opt *opt)

{

{

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport6_elem e = { };

	struct hash_ipport6_elem e = { .ip = { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);

	struct ip_set_ext ext = IP_SET_INIT_KEXT(skb, opt, set);





	if (!ip_set_get_ip6_port(skb, opt->flags & IPSET_DIM_TWO_SRC,

	if (!ip_set_get_ip6_port(skb, opt->flags & IPSET_DIM_TWO_SRC,
@@ -275,7 +275,7 @@ hash_ipport6_uadt(struct ip_set *set, struct nlattr *tb[], 
{

{

	const struct hash_ipport *h = set->data;

	const struct hash_ipport *h = set->data;

	ipset_adtfn adtfn = set->variant->adt[adt];

	ipset_adtfn adtfn = set->variant->adt[adt];

	struct hash_ipport6_elem e = { };

	struct hash_ipport6_elem e = { .ip = { .all = { 0 } } };

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	struct ip_set_ext ext = IP_SET_INIT_UEXT(set);

	u32 port, port_to;

	u32 port, port_to;

	bool with_ports = false;

	bool with_ports = false;