diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-01 17:28:18 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-01 17:28:18 -0800 |
commit | 8790ca172a1550949804a2ad59ccea310f680c9f (patch) | |
tree | f9a0bf451adc36dab6e4cb9f5430827bbd827384 /include/net/inetpeer.h | |
parent | 67d5288049f46f816181f63eaa8f1371877ad8ea (diff) | |
download | linux-8790ca172a1550949804a2ad59ccea310f680c9f.tar.gz linux-8790ca172a1550949804a2ad59ccea310f680c9f.tar.bz2 linux-8790ca172a1550949804a2ad59ccea310f680c9f.zip |
inetpeer: Kill use of inet_peer_address_t typedef.
They are verboten these days.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/inetpeer.h')
-rw-r--r-- | include/net/inetpeer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index fb8aeb1fd23f..5161bfdf5a52 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h @@ -14,18 +14,18 @@ #include <net/ipv6.h> #include <asm/atomic.h> -typedef struct { +struct inetpeer_addr { union { __be32 a4; __be32 a6[4]; }; __u16 family; -} inet_peer_address_t; +}; struct inet_peer { /* group together avl_left,avl_right,v4daddr to speedup lookups */ struct inet_peer __rcu *avl_left, *avl_right; - inet_peer_address_t daddr; + struct inetpeer_addr daddr; __u32 avl_height; struct list_head unused; __u32 dtime; /* the time of last use of not @@ -51,11 +51,11 @@ struct inet_peer { void inet_initpeers(void) __init; /* can be called with or without local BH being disabled */ -struct inet_peer *inet_getpeer(inet_peer_address_t *daddr, int create); +struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create); static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create) { - inet_peer_address_t daddr; + struct inetpeer_addr daddr; daddr.a4 = v4daddr; daddr.family = AF_INET; @@ -64,7 +64,7 @@ static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create) static inline struct inet_peer *inet_getpeer_v6(struct in6_addr *v6daddr, int create) { - inet_peer_address_t daddr; + struct inetpeer_addr daddr; ipv6_addr_copy((struct in6_addr *)daddr.a6, v6daddr); daddr.family = AF_INET6; |