Skip to content

Commit

Permalink
[IPV6]: Misc endianness annotations.
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Al Viro authored and David S. Miller committed Dec 3, 2006
1 parent b09b845 commit e69a4ad
Show file tree
Hide file tree
Showing 22 changed files with 62 additions and 60 deletions.
8 changes: 4 additions & 4 deletions include/net/addrconf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ struct prefix_info {
#else
#error "Please fix <asm/byteorder.h>"
#endif
__u32 valid;
__u32 prefered;
__u32 reserved2;
__be32 valid;
__be32 prefered;
__be32 reserved2;

struct in6_addr prefix;
};
Expand Down Expand Up @@ -183,7 +183,7 @@ static __inline__ u8 ipv6_addr_hash(const struct in6_addr *addr)
* This will include the IEEE address token on links that support it.
*/

word = addr->s6_addr32[2] ^ addr->s6_addr32[3];
word = (__force u32)(addr->s6_addr32[2] ^ addr->s6_addr32[3]);
word ^= (word >> 16);
word ^= (word >> 8);

Expand Down
2 changes: 1 addition & 1 deletion include/net/ip6_route.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct route_info {
route_pref:2,
reserved_h:3;
#endif
__u32 lifetime;
__be32 lifetime;
__u8 prefix[0]; /* 0,8 or 16 */
};

Expand Down
2 changes: 1 addition & 1 deletion include/net/ipv6.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ extern int ip6_datagram_connect(struct sock *sk,
struct sockaddr *addr, int addr_len);

extern int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len);
extern void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, u16 port,
extern void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, __be16 port,
u32 info, u8 *payload);
extern void ipv6_local_error(struct sock *sk, int err, struct flowi *fl, u32 info);

Expand Down
4 changes: 2 additions & 2 deletions include/net/ndisc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ struct rs_msg {

struct ra_msg {
struct icmp6hdr icmph;
__u32 reachable_time;
__u32 retrans_timer;
__be32 reachable_time;
__be32 retrans_timer;
};

struct nd_opt_hdr {
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/addrconf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ static inline unsigned ipv6_addr_scope2type(unsigned scope)

int __ipv6_addr_type(const struct in6_addr *addr)
{
u32 st;
__be32 st;

st = addr->s6_addr32[0];

Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/af_inet6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ static int inet6_create(struct socket *sock, int protocol)
* the user to assign a number at socket
* creation time automatically shares.
*/
inet->sport = ntohs(inet->num);
inet->sport = htons(inet->num);
sk->sk_prot->hash(sk);
}
if (sk->sk_prot->init) {
Expand Down Expand Up @@ -342,7 +342,7 @@ int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
sk->sk_userlocks |= SOCK_BINDADDR_LOCK;
if (snum)
sk->sk_userlocks |= SOCK_BINDPORT_LOCK;
inet->sport = ntohs(inet->num);
inet->sport = htons(inet->num);
inet->dport = 0;
inet->daddr = 0;
out:
Expand Down
6 changes: 3 additions & 3 deletions net/ipv6/datagram.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ int ip6_datagram_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
}

void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err,
u16 port, u32 info, u8 *payload)
__be16 port, u32 info, u8 *payload)
{
struct ipv6_pinfo *np = inet6_sk(sk);
struct icmp6hdr *icmph = (struct icmp6hdr *)skb->h.raw;
Expand Down Expand Up @@ -324,7 +324,7 @@ int ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len)
} else {
ipv6_addr_set(&sin->sin6_addr, 0, 0,
htonl(0xffff),
*(u32*)(skb->nh.raw + serr->addr_offset));
*(__be32*)(skb->nh.raw + serr->addr_offset));
}
}

Expand Down Expand Up @@ -397,7 +397,7 @@ int datagram_recv_ctl(struct sock *sk, struct msghdr *msg, struct sk_buff *skb)
}

if (np->rxopt.bits.rxtclass) {
int tclass = (ntohl(*(u32 *)skb->nh.ipv6h) >> 20) & 0xff;
int tclass = (ntohl(*(__be32 *)skb->nh.ipv6h) >> 20) & 0xff;
put_cmsg(msg, SOL_IPV6, IPV6_TCLASS, sizeof(tclass), &tclass);
}

Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/exthdrs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ static int ipv6_hop_jumbo(struct sk_buff **skbp, int optoff)
goto drop;
}

pkt_len = ntohl(*(u32*)(skb->nh.raw+optoff+2));
pkt_len = ntohl(*(__be32*)(skb->nh.raw+optoff+2));
if (pkt_len <= IPV6_MAXPLEN) {
IP6_INC_STATS_BH(ip6_dst_idev(skb->dst), IPSTATS_MIB_INHDRERRORS);
icmpv6_param_prob(skb, ICMPV6_HDR_FIELD, optoff+2);
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/exthdrs_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ int ipv6_skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp)
if (hp == NULL)
return -1;
if (nexthdr == NEXTHDR_FRAGMENT) {
unsigned short _frag_off, *fp;
__be16 _frag_off, *fp;
fp = skb_header_pointer(skb,
start+offsetof(struct frag_hdr,
frag_off),
Expand Down
8 changes: 4 additions & 4 deletions net/ipv6/inet6_connection_sock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ EXPORT_SYMBOL_GPL(inet6_csk_bind_conflict);
static u32 inet6_synq_hash(const struct in6_addr *raddr, const __be16 rport,
const u32 rnd, const u16 synq_hsize)
{
u32 a = raddr->s6_addr32[0];
u32 b = raddr->s6_addr32[1];
u32 c = raddr->s6_addr32[2];
u32 a = (__force u32)raddr->s6_addr32[0];
u32 b = (__force u32)raddr->s6_addr32[1];
u32 c = (__force u32)raddr->s6_addr32[2];

a += JHASH_GOLDEN_RATIO;
b += JHASH_GOLDEN_RATIO;
c += rnd;
__jhash_mix(a, b, c);

a += raddr->s6_addr32[3];
a += (__force u32)raddr->s6_addr32[3];
b += (__force u32)rport;
__jhash_mix(a, b, c);

Expand Down
8 changes: 4 additions & 4 deletions net/ipv6/ip6_fib.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ static __inline__ u32 fib6_new_sernum(void)
* test bit
*/

static __inline__ int addr_bit_set(void *token, int fn_bit)
static __inline__ __be32 addr_bit_set(void *token, int fn_bit)
{
__u32 *addr = token;
__be32 *addr = token;

return htonl(1 << ((~fn_bit)&0x1F)) & addr[fn_bit>>5];
}
Expand Down Expand Up @@ -434,7 +434,7 @@ static struct fib6_node * fib6_add_1(struct fib6_node *root, void *addr,
struct fib6_node *pn = NULL;
struct rt6key *key;
int bit;
int dir = 0;
__be32 dir = 0;
__u32 sernum = fib6_new_sernum();

RT6_TRACE("fib6_add_1\n");
Expand Down Expand Up @@ -829,7 +829,7 @@ static struct fib6_node * fib6_lookup_1(struct fib6_node *root,
struct lookup_args *args)
{
struct fib6_node *fn;
int dir;
__be32 dir;

if (unlikely(args->offset == 0))
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/ip6_tunnel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ MODULE_LICENSE("GPL");

#define HASH_SIZE 32

#define HASH(addr) (((addr)->s6_addr32[0] ^ (addr)->s6_addr32[1] ^ \
#define HASH(addr) ((__force u32)((addr)->s6_addr32[0] ^ (addr)->s6_addr32[1] ^ \
(addr)->s6_addr32[2] ^ (addr)->s6_addr32[3]) & \
(HASH_SIZE - 1))

Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/mip6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,10 +262,10 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct
sel.proto = fl->proto;
sel.dport = xfrm_flowi_dport(fl);
if (sel.dport)
sel.dport_mask = ~((__u16)0);
sel.dport_mask = htons(~0);
sel.sport = xfrm_flowi_sport(fl);
if (sel.sport)
sel.sport_mask = ~((__u16)0);
sel.sport_mask = htons(~0);
sel.ifindex = fl->oif;

err = km_report(IPPROTO_DSTOPTS, &sel,
Expand Down
5 changes: 3 additions & 2 deletions net/ipv6/ndisc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1267,10 +1267,11 @@ static void ndisc_router_discovery(struct sk_buff *skb)
}

if (ndopts.nd_opts_mtu) {
__be32 n;
u32 mtu;

memcpy(&mtu, ((u8*)(ndopts.nd_opts_mtu+1))+2, sizeof(mtu));
mtu = ntohl(mtu);
memcpy(&n, ((u8*)(ndopts.nd_opts_mtu+1))+2, sizeof(mtu));
mtu = ntohl(n);

if (mtu < IPV6_MIN_MTU || mtu > skb->dev->mtu) {
ND_PRINTK2(KERN_WARNING
Expand Down
3 changes: 2 additions & 1 deletion net/ipv6/netfilter/ip6_tables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1481,7 +1481,8 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
if (hp == NULL)
return -EBADMSG;
if (nexthdr == NEXTHDR_FRAGMENT) {
unsigned short _frag_off, *fp;
unsigned short _frag_off;
__be16 *fp;
fp = skb_header_pointer(skb,
start+offsetof(struct frag_hdr,
frag_off),
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/netfilter/ip6t_LOG.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ static void dump_packet(const struct nf_loginfo *info,
/* Max length: 44 "LEN=65535 TC=255 HOPLIMIT=255 FLOWLBL=FFFFF " */
printk("LEN=%Zu TC=%u HOPLIMIT=%u FLOWLBL=%u ",
ntohs(ih->payload_len) + sizeof(struct ipv6hdr),
(ntohl(*(u_int32_t *)ih) & 0x0ff00000) >> 20,
(ntohl(*(__be32 *)ih) & 0x0ff00000) >> 20,
ih->hop_limit,
(ntohl(*(u_int32_t *)ih) & 0x000fffff));
(ntohl(*(__be32 *)ih) & 0x000fffff));

fragment = 0;
ptr = ip6hoff + sizeof(struct ipv6hdr);
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/raw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static int rawv6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
struct inet_sock *inet = inet_sk(sk);
struct ipv6_pinfo *np = inet6_sk(sk);
struct sockaddr_in6 *addr = (struct sockaddr_in6 *) uaddr;
__u32 v4addr = 0;
__be32 v4addr = 0;
int addr_type;
int err;

Expand Down
26 changes: 13 additions & 13 deletions net/ipv6/reassembly.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ struct frag_queue
struct hlist_node list;
struct list_head lru_list; /* lru list member */

__u32 id; /* fragment id */
__be32 id; /* fragment id */
struct in6_addr saddr;
struct in6_addr daddr;

Expand Down Expand Up @@ -125,28 +125,28 @@ static __inline__ void fq_unlink(struct frag_queue *fq)
* callers should be careful not to use the hash value outside the ipfrag_lock
* as doing so could race with ipfrag_hash_rnd being recalculated.
*/
static unsigned int ip6qhashfn(u32 id, struct in6_addr *saddr,
static unsigned int ip6qhashfn(__be32 id, struct in6_addr *saddr,
struct in6_addr *daddr)
{
u32 a, b, c;

a = saddr->s6_addr32[0];
b = saddr->s6_addr32[1];
c = saddr->s6_addr32[2];
a = (__force u32)saddr->s6_addr32[0];
b = (__force u32)saddr->s6_addr32[1];
c = (__force u32)saddr->s6_addr32[2];

a += JHASH_GOLDEN_RATIO;
b += JHASH_GOLDEN_RATIO;
c += ip6_frag_hash_rnd;
__jhash_mix(a, b, c);

a += saddr->s6_addr32[3];
b += daddr->s6_addr32[0];
c += daddr->s6_addr32[1];
a += (__force u32)saddr->s6_addr32[3];
b += (__force u32)daddr->s6_addr32[0];
c += (__force u32)daddr->s6_addr32[1];
__jhash_mix(a, b, c);

a += daddr->s6_addr32[2];
b += daddr->s6_addr32[3];
c += id;
a += (__force u32)daddr->s6_addr32[2];
b += (__force u32)daddr->s6_addr32[3];
c += (__force u32)id;
__jhash_mix(a, b, c);

return c & (IP6Q_HASHSZ - 1);
Expand Down Expand Up @@ -370,7 +370,7 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in)


static struct frag_queue *
ip6_frag_create(u32 id, struct in6_addr *src, struct in6_addr *dst,
ip6_frag_create(__be32 id, struct in6_addr *src, struct in6_addr *dst,
struct inet6_dev *idev)
{
struct frag_queue *fq;
Expand All @@ -396,7 +396,7 @@ ip6_frag_create(u32 id, struct in6_addr *src, struct in6_addr *dst,
}

static __inline__ struct frag_queue *
fq_find(u32 id, struct in6_addr *src, struct in6_addr *dst,
fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst,
struct inet6_dev *idev)
{
struct frag_queue *fq;
Expand Down
2 changes: 1 addition & 1 deletion net/ipv6/route.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len,
if (pref == ICMPV6_ROUTER_PREF_INVALID)
pref = ICMPV6_ROUTER_PREF_MEDIUM;

lifetime = htonl(rinfo->lifetime);
lifetime = ntohl(rinfo->lifetime);
if (lifetime == 0xffffffff) {
/* infinity */
} else if (lifetime > 0x7fffffff/HZ) {
Expand Down
18 changes: 9 additions & 9 deletions net/ipv6/sit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
*/

#define HASH_SIZE 16
#define HASH(addr) ((addr^(addr>>4))&0xF)
#define HASH(addr) (((__force u32)addr^((__force u32)addr>>4))&0xF)

static int ipip6_fb_tunnel_init(struct net_device *dev);
static int ipip6_tunnel_init(struct net_device *dev);
Expand All @@ -76,7 +76,7 @@ static struct ip_tunnel **tunnels[4] = { tunnels_wc, tunnels_l, tunnels_r, tunne

static DEFINE_RWLOCK(ipip6_lock);

static struct ip_tunnel * ipip6_tunnel_lookup(u32 remote, u32 local)
static struct ip_tunnel * ipip6_tunnel_lookup(__be32 remote, __be32 local)
{
unsigned h0 = HASH(remote);
unsigned h1 = HASH(local);
Expand All @@ -102,8 +102,8 @@ static struct ip_tunnel * ipip6_tunnel_lookup(u32 remote, u32 local)

static struct ip_tunnel ** ipip6_bucket(struct ip_tunnel *t)
{
u32 remote = t->parms.iph.daddr;
u32 local = t->parms.iph.saddr;
__be32 remote = t->parms.iph.daddr;
__be32 local = t->parms.iph.saddr;
unsigned h = 0;
int prio = 0;

Expand Down Expand Up @@ -144,8 +144,8 @@ static void ipip6_tunnel_link(struct ip_tunnel *t)

static struct ip_tunnel * ipip6_tunnel_locate(struct ip_tunnel_parm *parms, int create)
{
u32 remote = parms->iph.daddr;
u32 local = parms->iph.saddr;
__be32 remote = parms->iph.daddr;
__be32 local = parms->iph.saddr;
struct ip_tunnel *t, **tp, *nt;
struct net_device *dev;
unsigned h = 0;
Expand Down Expand Up @@ -405,9 +405,9 @@ static int ipip6_rcv(struct sk_buff *skb)
/* Returns the embedded IPv4 address if the IPv6 address
comes from 6to4 (RFC 3056) addr space */

static inline u32 try_6to4(struct in6_addr *v6dst)
static inline __be32 try_6to4(struct in6_addr *v6dst)
{
u32 dst = 0;
__be32 dst = 0;

if (v6dst->s6_addr16[0] == htons(0x2002)) {
/* 6to4 v6 addr has 16 bits prefix, 32 v4addr, 16 SLA, ... */
Expand All @@ -432,7 +432,7 @@ static int ipip6_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
struct net_device *tdev; /* Device to other host */
struct iphdr *iph; /* Our new IP header */
int max_headroom; /* The extra header space needed */
u32 dst = tiph->daddr;
__be32 dst = tiph->daddr;
int mtu;
struct in6_addr *addr6;
int addr_type;
Expand Down
4 changes: 2 additions & 2 deletions net/ipv6/tcp_ipv6.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,7 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw,
struct sk_buff *buff;
struct flowi fl;
int tot_len = sizeof(struct tcphdr);
u32 *topt;
__be32 *topt;
#ifdef CONFIG_TCP_MD5SIG
struct tcp_md5sig_key *key;
struct tcp_md5sig_key tw_key;
Expand Down Expand Up @@ -1128,7 +1128,7 @@ static void tcp_v6_send_ack(struct tcp_timewait_sock *tw,
t1->ack = 1;
t1->window = htons(win);

topt = (u32*)(t1 + 1);
topt = (__be32 *)(t1 + 1);

if (ts) {
*topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) |
Expand Down
Loading

0 comments on commit e69a4ad

Please sign in to comment.