Commit 582ee43d authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

net/* misc endianness annotations 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 704eae1f

net/bridge/br_input.c

+3 −3
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ static int br_handle_local_finish(struct sk_buff *skb) 
 */

static inline int is_link_local(const unsigned char *dest)

{

	const u16 *a = (const u16 *) dest;

	static const u16 *const b = (const u16 *const ) br_group_address;

	static const u16 m = __constant_cpu_to_be16(0xfff0);

	__be16 *a = (__be16 *)dest;

	static const __be16 *b = (const __be16 *)br_group_address;

	static const __be16 m = __constant_cpu_to_be16(0xfff0);



	return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | ((a[2] ^ b[2]) & m)) == 0;

}

net/key/af_key.c

+2 −2
Original line number Diff line number Diff line
@@ -2540,7 +2540,7 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb, 
	sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);

	sel.sport = ((struct sockaddr_in *)(sa + 1))->sin_port;

	if (sel.sport)

		sel.sport_mask = ~0;

		sel.sport_mask = htons(0xffff);



	/* set destination address info of selector */

	sa = ext_hdrs[SADB_EXT_ADDRESS_DST - 1],
@@ -2549,7 +2549,7 @@ static int pfkey_migrate(struct sock *sk, struct sk_buff *skb, 
	sel.proto = pfkey_proto_to_xfrm(sa->sadb_address_proto);

	sel.dport = ((struct sockaddr_in *)(sa + 1))->sin_port;

	if (sel.dport)

		sel.dport_mask = ~0;

		sel.dport_mask = htons(0xffff);



	rq = (struct sadb_x_ipsecrequest *)(pol + 1);

net/rxrpc/ar-connection.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ struct rxrpc_conn_bundle *rxrpc_get_bundle(struct rxrpc_sock *rx, 
	struct rb_node *p, *parent, **pp;



	_enter("%p{%x},%x,%hx,",

	       rx, key_serial(key), trans->debug_id, ntohl(service_id));

	       rx, key_serial(key), trans->debug_id, ntohs(service_id));



	if (rx->trans == trans && rx->bundle) {

		atomic_inc(&rx->bundle->usage);

net/sunrpc/svcsock.c

+2 −2
Original line number Diff line number Diff line
@@ -131,13 +131,13 @@ static char *__svc_print_addr(struct sockaddr *addr, char *buf, size_t len) 
	case AF_INET:

		snprintf(buf, len, "%u.%u.%u.%u, port=%u",

			NIPQUAD(((struct sockaddr_in *) addr)->sin_addr),

			htons(((struct sockaddr_in *) addr)->sin_port));

			ntohs(((struct sockaddr_in *) addr)->sin_port));

		break;



	case AF_INET6:

		snprintf(buf, len, "%x:%x:%x:%x:%x:%x:%x:%x, port=%u",

			NIP6(((struct sockaddr_in6 *) addr)->sin6_addr),

			htons(((struct sockaddr_in6 *) addr)->sin6_port));

			ntohs(((struct sockaddr_in6 *) addr)->sin6_port));

		break;



	default:

net/tipc/msg.h

+2 −4
Original line number Diff line number Diff line
@@ -72,10 +72,8 @@ static inline void msg_set_bits(struct tipc_msg *m, u32 w, 
				u32 pos, u32 mask, u32 val)

{

	val = (val & mask) << pos;

	val = htonl(val);

	mask = htonl(mask << pos);

	m->hdr[w] &= ~mask;

	m->hdr[w] |= val;

	m->hdr[w] &= ~htonl(mask << pos);

	m->hdr[w] |= htonl(val);

}



/*