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

Commit c47d36b3 authored by Arushi Singhal's avatar Arushi Singhal Committed by Pablo Neira Ayuso
Browse files

netfilter: Merge assignment with return 



Merge assignment with return statement to directly return the value.

Signed-off-by: default avatarArushi Singhal <arushisinghal19971997@gmail.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent a3073c17

net/netfilter/nf_conntrack_netlink.c

+2 −3
Original line number Diff line number Diff line
@@ -1527,9 +1527,8 @@ ctnetlink_setup_nat(struct nf_conn *ct, const struct nlattr * const cda[]) 
	if (ret < 0)

		return ret;



	ret = ctnetlink_parse_nat_setup(ct, NF_NAT_MANIP_SRC,

	return ctnetlink_parse_nat_setup(ct, NF_NAT_MANIP_SRC,

					 cda[CTA_NAT_SRC]);

	return ret;

#else

	if (!cda[CTA_NAT_DST] && !cda[CTA_NAT_SRC])

		return 0;

net/netfilter/xt_hashlimit.c

+1 −2
Original line number Diff line number Diff line
@@ -534,8 +534,7 @@ static u64 user2rate_bytes(u32 user) 
	u64 r;



	r = user ? U32_MAX / user : U32_MAX;

	r = (r - 1) << XT_HASHLIMIT_BYTE_SHIFT;

	return r;

	return (r - 1) << XT_HASHLIMIT_BYTE_SHIFT;

}



static void rateinfo_recalc(struct dsthash_ent *dh, unsigned long now,