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

Commit f7277f8d authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: remove redundant casts from Ebtables 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 66bff35b

net/bridge/netfilter/ebt_arpreply.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ ebt_arpreply_tg(struct sk_buff *skb, const struct net_device *in, 
		const struct net_device *out, unsigned int hook_nr,

		const struct xt_target *target, const void *data)

{

	struct ebt_arpreply_info *info = (void *)data;

	const struct ebt_arpreply_info *info = data;

	const __be32 *siptr, *diptr;

	__be32 _sip, _dip;

	const struct arphdr *ap;

net/bridge/netfilter/ebt_ip6.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ ebt_ip6_mt(const struct sk_buff *skb, const struct net_device *in, 
	   const struct net_device *out, const struct xt_match *match,

	   const void *data, int offset, unsigned int protoff, bool *hotdrop)

{

	const struct ebt_ip6_info *info = (struct ebt_ip6_info *)data;

	const struct ebt_ip6_info *info = data;

	const struct ipv6hdr *ih6;

	struct ipv6hdr _ip6h;

	const struct tcpudphdr *pptr;
@@ -98,7 +98,7 @@ ebt_ip6_mt_check(const char *table, const void *entry, 
		 unsigned int hook_mask)

{

	const struct ebt_entry *e = entry;

	struct ebt_ip6_info *info = (struct ebt_ip6_info *)data;

	struct ebt_ip6_info *info = data;



	if (e->ethproto != htons(ETH_P_IPV6) || e->invflags & EBT_IPROTO)

		return false;

net/bridge/netfilter/ebt_limit.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ ebt_limit_mt(const struct sk_buff *skb, const struct net_device *in, 
	     const struct net_device *out, const struct xt_match *match,

	     const void *data, int offset, unsigned int protoff, bool *hotdrop)

{

	struct ebt_limit_info *info = (struct ebt_limit_info *)data;

	struct ebt_limit_info *info = (void *)data;

	unsigned long now = jiffies;



	spin_lock_bh(&limit_lock);

net/bridge/netfilter/ebt_nflog.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ ebt_nflog_tg(struct sk_buff *skb, const struct net_device *in, 
	     const struct net_device *out, unsigned int hooknr,

	     const struct xt_target *target, const void *data)

{

	struct ebt_nflog_info *info = (struct ebt_nflog_info *)data;

	const struct ebt_nflog_info *info = data;

	struct nf_loginfo li;



	li.type = NF_LOG_TYPE_ULOG;
@@ -41,7 +41,7 @@ ebt_nflog_tg_check(const char *table, const void *e, 
		   const struct xt_target *target, void *data,

		   unsigned int hookmask)

{

	struct ebt_nflog_info *info = (struct ebt_nflog_info *)data;

	struct ebt_nflog_info *info = data;



	if (info->flags & ~EBT_NFLOG_MASK)

		return false;