Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 53576d9b995605a9edc7414b900a9218c8f23b1f

Authored by Al Viro
Committed by David S. Miller
1 parent d878e72e41
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[IPV4]: inetpeer annotations 

This one is interesting - we use net-endian value as search key, but
order the tree by *host-endian* comparisons of keys.  OK since we only
care about lookups.  Annotated inet_getpeer() and friends.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

include/net/inetpeer.h
Diff comments   View file @ 53576d9
... ... @@ -22,7 +22,7 @@
22 22 unsigned long dtime; /* the time of last use of not
23 23 * referenced entries */
24 24 atomic_t refcnt;
25   - __u32 v4daddr; /* peer's address */
  25 + __be32 v4daddr; /* peer's address */
26 26 __u16 avl_height;
27 27 __u16 ip_id_count; /* IP ID for the next packet */
28 28 atomic_t rid; /* Frag reception counter */
... ... @@ -33,7 +33,7 @@
33 33 void inet_initpeers(void) __init;
34 34  
35 35 /* can be called with or without local BH being disabled */
36   -struct inet_peer *inet_getpeer(__u32 daddr, int create);
  36 +struct inet_peer *inet_getpeer(__be32 daddr, int create);
37 37  
38 38 extern spinlock_t inet_peer_unused_lock;
39 39 extern struct inet_peer **inet_peer_unused_tailp;
... ... @@ -163,7 +163,7 @@
163 163 for (u = peer_root; u != peer_avl_empty; ) { \
164 164 if (daddr == u->v4daddr) \
165 165 break; \
166   - if (daddr < u->v4daddr) \
  166 + if ((__force __u32)daddr < (__force __u32)u->v4daddr) \
167 167 v = &u->avl_left; \
168 168 else \
169 169 v = &u->avl_right; \
... ... @@ -368,7 +368,7 @@
368 368 }
369 369  
370 370 /* Called with or without local BH being disabled. */
371   -struct inet_peer *inet_getpeer(__u32 daddr, int create)
  371 +struct inet_peer *inet_getpeer(__be32 daddr, int create)
372 372 {
373 373 struct inet_peer *p, *n;
374 374 struct inet_peer **stack[PEER_MAXDEPTH], ***stackptr;