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

Commit 7a6b1c46 authored by Jan Engelhardt's avatar Jan Engelhardt
Browse files

netfilter: xtables: remove another level of indent 



Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
parent 9452258d

net/ipv4/netfilter/arp_tables.c

+17 −16
Original line number Diff line number Diff line
@@ -313,7 +313,9 @@ unsigned int arpt_do_table(struct sk_buff *skb, 
			}



			e = get_entry(table_base, v);

		} else {

			continue;

		}



		/* Targets which reenter must return

		 * abs. verdicts

		 */
@@ -329,7 +331,6 @@ unsigned int arpt_do_table(struct sk_buff *skb, 
		else

			/* Verdict */

			break;

		}

	} while (!hotdrop);

	xt_info_rdunlock_bh();

net/ipv4/netfilter/ip_tables.c

+25 −27
Original line number Diff line number Diff line
@@ -402,26 +402,25 @@ ipt_do_table(struct sk_buff *skb, 
			}



			e = get_entry(table_base, v);

		} else {

			continue;

		}



		/* Targets which reenter must return

		   abs. verdicts */

		tgpar.target   = t->u.kernel.target;

		tgpar.targinfo = t->data;

#ifdef CONFIG_NETFILTER_DEBUG

			((struct ipt_entry *)table_base)->comefrom

				= 0xeeeeeeec;

		((struct ipt_entry *)table_base)->comefrom = 0xeeeeeeec;

#endif

		verdict = t->u.kernel.target->target(skb, &tgpar);

#ifdef CONFIG_NETFILTER_DEBUG

			if (((struct ipt_entry *)table_base)->comefrom

			    != 0xeeeeeeec

			    && verdict == IPT_CONTINUE) {

		if (((struct ipt_entry *)table_base)->comefrom != 0xeeeeeeec &&

		    verdict == IPT_CONTINUE) {

			printk("Target %s reentered!\n",

			       t->u.kernel.target->name);

			verdict = NF_DROP;

		}

			((struct ipt_entry *)table_base)->comefrom

				= 0x57acc001;

		((struct ipt_entry *)table_base)->comefrom = 0x57acc001;

#endif

		/* Target might have changed stuff. */

		ip = ip_hdr(skb);
@@ -432,7 +431,6 @@ ipt_do_table(struct sk_buff *skb, 
		else

			/* Verdict */

			break;

		}

	} while (!hotdrop);

	xt_info_rdunlock_bh();

net/ipv6/netfilter/ip6_tables.c

+21 −23
Original line number Diff line number Diff line
@@ -431,35 +431,33 @@ ip6t_do_table(struct sk_buff *skb, 
			}



			e = get_entry(table_base, v);

		} else {

			continue;

		}



		/* Targets which reenter must return

		   abs. verdicts */

		tgpar.target   = t->u.kernel.target;

		tgpar.targinfo = t->data;



#ifdef CONFIG_NETFILTER_DEBUG

			((struct ip6t_entry *)table_base)->comefrom

				= 0xeeeeeeec;

		((struct ip6t_entry *)table_base)->comefrom = 0xeeeeeeec;

#endif

		verdict = t->u.kernel.target->target(skb, &tgpar);



#ifdef CONFIG_NETFILTER_DEBUG

			if (((struct ip6t_entry *)table_base)->comefrom

			    != 0xeeeeeeec

			    && verdict == IP6T_CONTINUE) {

		if (((struct ip6t_entry *)table_base)->comefrom != 0xeeeeeeec &&

		    verdict == IP6T_CONTINUE) {

			printk("Target %s reentered!\n",

			       t->u.kernel.target->name);

			verdict = NF_DROP;

		}

			((struct ip6t_entry *)table_base)->comefrom

				= 0x57acc001;

		((struct ip6t_entry *)table_base)->comefrom = 0x57acc001;

#endif

		if (verdict == IP6T_CONTINUE)

			e = ip6t_next_entry(e);

		else

			/* Verdict */

			break;

		}

	} while (!hotdrop);



#ifdef CONFIG_NETFILTER_DEBUG