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

Commit f0daaa65 authored by Yasuyuki Kozakai's avatar Yasuyuki Kozakai Committed by David S. Miller
Browse files

[NETFILTER] ip6tables: whitespace and indent cosmetic cleanup 



Signed-off-by: default avatarYasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Signed-off-by: default avatarHarald Welte <laforge@netfilter.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0069cae

net/ipv6/netfilter/ip6t_dst.c

+75 −76
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ match(const struct sk_buff *skb, 
		((optinfo->hdrlen == hdrlen) ^

		 !!(optinfo->invflags & IP6T_OPTS_INV_LEN))));



       ret = (oh != NULL)

       		&&

	ret = (oh != NULL) &&

	      (!(optinfo->flags & IP6T_OPTS_LEN) ||

	       ((optinfo->hdrlen == hdrlen) ^

		!!(optinfo->invflags & IP6T_OPTS_INV_LEN)));
@@ -169,7 +168,8 @@ match(const struct sk_buff *skb, 
		}

		if (temp == optinfo->optsnr)

			return ret;

		else return 0;

		else

			return 0;

	}



	return 0;
@@ -191,8 +191,7 @@ checkentry(const char *tablename, 
		return 0;

	}

	if (optsinfo->invflags & ~IP6T_OPTS_INV_MASK) {

              DEBUGP("ip6t_opts: unknown flags %X\n",

                      optsinfo->invflags);

		DEBUGP("ip6t_opts: unknown flags %X\n", optsinfo->invflags);

		return 0;

	}

net/ipv6/netfilter/ip6t_eui64.c

+34 −34
Original line number Diff line number Diff line
@@ -27,13 +27,12 @@ match(const struct sk_buff *skb, 
      unsigned int protoff,

      int *hotdrop)

{



	unsigned char eui64[8];

	int i = 0;



     if ( !(skb->mac.raw >= skb->head

                && (skb->mac.raw + ETH_HLEN) <= skb->data)

                && offset != 0) {

	if (!(skb->mac.raw >= skb->head &&

	      (skb->mac.raw + ETH_HLEN) <= skb->data) &&

	    offset != 0) {

		*hotdrop = 1;

		return 0;

	}
@@ -49,8 +48,9 @@ match(const struct sk_buff *skb, 
			eui64[0] |= 0x02;



			i = 0;

	 while ((skb->nh.ipv6h->saddr.s6_addr[8+i] ==

			 eui64[i]) && (i<8)) i++;

			while ((skb->nh.ipv6h->saddr.s6_addr[8+i] == eui64[i])

			       && (i < 8))

				i++;



			if (i == 8)

				return 1;

net/ipv6/netfilter/ip6t_frag.c

+78 −79
Original line number Diff line number Diff line
@@ -128,8 +128,7 @@ checkentry(const char *tablename, 
		return 0;

	}

	if (fraginfo->invflags & ~IP6T_FRAG_INV_MASK) {

              DEBUGP("ip6t_frag: unknown flags %X\n",

                      fraginfo->invflags);

		DEBUGP("ip6t_frag: unknown flags %X\n", fraginfo->invflags);

		return 0;

	}

net/ipv6/netfilter/ip6t_hbh.c

+75 −76
Original line number Diff line number Diff line
@@ -97,8 +97,7 @@ match(const struct sk_buff *skb, 
		((optinfo->hdrlen == hdrlen) ^

		 !!(optinfo->invflags & IP6T_OPTS_INV_LEN))));



       ret = (oh != NULL)

       		&&

	ret = (oh != NULL) &&

	      (!(optinfo->flags & IP6T_OPTS_LEN) ||

	       ((optinfo->hdrlen == hdrlen) ^

		!!(optinfo->invflags & IP6T_OPTS_INV_LEN)));
@@ -169,7 +168,8 @@ match(const struct sk_buff *skb, 
		}

		if (temp == optinfo->optsnr)

			return ret;

		else return 0;

		else

			return 0;

	}



	return 0;
@@ -191,8 +191,7 @@ checkentry(const char *tablename, 
		return 0;

	}

	if (optsinfo->invflags & ~IP6T_OPTS_INV_MASK) {

              DEBUGP("ip6t_opts: unknown flags %X\n",

                      optsinfo->invflags);

		DEBUGP("ip6t_opts: unknown flags %X\n", optsinfo->invflags);

		return 0;

	}

net/ipv6/netfilter/ip6t_ipv6header.c

+39 −40
Original line number Diff line number Diff line
@@ -137,8 +137,8 @@ ipv6header_checkentry(const char *tablename, 
		return 0;



	/* invflags is 0 or 0xff in hard mode */

	if ((!info->modeflag) && info->invflags != 0x00

			      && info->invflags != 0xFF)

	if ((!info->modeflag) && info->invflags != 0x00 &&

	    info->invflags != 0xFF)

		return 0;



	return 1;
@@ -164,4 +164,3 @@ static void __exit ipv6header_exit(void) 


module_init(ipv6header_init);

module_exit(ipv6header_exit);