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

Commit b189db5d authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

net: remove NIP6(), NIP6_FMT, NIP6_SEQFMT and final users 



Open code NIP6_FMT in the one call inside sscanf and one user
of NIP6() that could use %p6 in the netfilter code.

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a20fd0a7

include/linux/kernel.h

+0 −12
Original line number Original line Diff line number Diff line
@@ -357,18 +357,6 @@ static inline char *pack_hex_byte(char *buf, u8 byte) 
	((unsigned char *)&addr)[3]

	((unsigned char *)&addr)[3]

#define NIPQUAD_FMT "%u.%u.%u.%u"

#define NIPQUAD_FMT "%u.%u.%u.%u"





#define NIP6(addr) \

	ntohs((addr).s6_addr16[0]), \

	ntohs((addr).s6_addr16[1]), \

	ntohs((addr).s6_addr16[2]), \

	ntohs((addr).s6_addr16[3]), \

	ntohs((addr).s6_addr16[4]), \

	ntohs((addr).s6_addr16[5]), \

	ntohs((addr).s6_addr16[6]), \

	ntohs((addr).s6_addr16[7])

#define NIP6_FMT "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x"

#define NIP6_SEQFMT "%04x%04x%04x%04x%04x%04x%04x%04x"



#if defined(__LITTLE_ENDIAN)

#if defined(__LITTLE_ENDIAN)

#define HIPQUAD(addr) \

#define HIPQUAD(addr) \

	((unsigned char *)&addr)[3], \

	((unsigned char *)&addr)[3], \

net/bridge/netfilter/ebt_log.c

+2 −4
Original line number Original line Diff line number Diff line
@@ -133,10 +133,8 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum, 
			printk(" INCOMPLETE IPv6 header");

			printk(" INCOMPLETE IPv6 header");

			goto out;

			goto out;

		}

		}

		printk(" IPv6 SRC=%x:%x:%x:%x:%x:%x:%x:%x "

		printk(" IPv6 SRC=%p6 IPv6 DST=%p6, IPv6 priority=0x%01X, Next Header=%d",

		       "IPv6 DST=%x:%x:%x:%x:%x:%x:%x:%x, IPv6 "

		       &ih->saddr, &ih->daddr, ih->priority, ih->nexthdr);

		       "priority=0x%01X, Next Header=%d", NIP6(ih->saddr),

		       NIP6(ih->daddr), ih->priority, ih->nexthdr);

		nexthdr = ih->nexthdr;

		nexthdr = ih->nexthdr;

		offset_ph = ipv6_skip_exthdr(skb, sizeof(_iph), &nexthdr);

		offset_ph = ipv6_skip_exthdr(skb, sizeof(_iph), &nexthdr);

		if (offset_ph == -1)

		if (offset_ph == -1)

net/sunrpc/svcauth_unix.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ static int ip_map_parse(struct cache_detail *cd, 
		addr.s6_addr32[2] = htonl(0xffff);

		addr.s6_addr32[2] = htonl(0xffff);

		addr.s6_addr32[3] =

		addr.s6_addr32[3] =

			htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);

			htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);

       } else if (sscanf(buf, NIP6_FMT "%c",

       } else if (sscanf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x%c",

			&b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &c) == 8) {

			&b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &c) == 8) {

		addr.s6_addr16[0] = htons(b1);

		addr.s6_addr16[0] = htons(b1);

		addr.s6_addr16[1] = htons(b2);

		addr.s6_addr16[1] = htons(b2);