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

Commit 15b4d93f authored by Jozsef Kadlecsik's avatar Jozsef Kadlecsik Committed by Patrick McHardy
Browse files

netfilter: ipset: whitespace and coding fixes detected by checkpatch.pl

parent e385357a
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ struct htable {
	struct hbucket bucket[0]; /* hashtable buckets */
};

#define hbucket(h, i)		&((h)->bucket[i])
#define hbucket(h, i)		(&((h)->bucket[i]))

/* Book-keeping of the prefixes added to the set */
struct ip_set_hash_nets {
+2 −1
Original line number Diff line number Diff line
@@ -635,7 +635,8 @@ static struct ip_set_type bitmap_ipmac_type = {
	},
	.adt_policy	= {
		[IPSET_ATTR_IP]		= { .type = NLA_NESTED },
		[IPSET_ATTR_ETHER]	= { .type = NLA_BINARY, .len  = ETH_ALEN },
		[IPSET_ATTR_ETHER]	= { .type = NLA_BINARY,
					    .len  = ETH_ALEN },
		[IPSET_ATTR_TIMEOUT]	= { .type = NLA_U32 },
		[IPSET_ATTR_LINENO]	= { .type = NLA_U32 },
	},
+13 −13
Original line number Diff line number Diff line
@@ -372,8 +372,8 @@ hash_netiface4_uadt(struct ip_set *set, struct nlattr *tb[],
		return ret;

	if (tb[IPSET_ATTR_CADT_FLAGS]) {
		u32 flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
		if (flags & IPSET_FLAG_PHYSDEV)
		u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
		if (cadt_flags & IPSET_FLAG_PHYSDEV)
			data.physdev = 1;
	}

@@ -636,8 +636,8 @@ hash_netiface6_uadt(struct ip_set *set, struct nlattr *tb[],
		return ret;

	if (tb[IPSET_ATTR_CADT_FLAGS]) {
		u32 flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
		if (flags & IPSET_FLAG_PHYSDEV)
		u32 cadt_flags = ip_set_get_h32(tb[IPSET_ATTR_CADT_FLAGS]);
		if (cadt_flags & IPSET_FLAG_PHYSDEV)
			data.physdev = 1;
	}

+3 −3

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+2 −2

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.

Loading