Skip to content

Commit 8790ca1

Browse files
committed
inetpeer: Kill use of inet_peer_address_t typedef.
They are verboten these days. Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 67d5288 commit 8790ca1

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

include/net/inetpeer.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
#include <net/ipv6.h>
1515
#include <asm/atomic.h>
1616

17-
typedef struct {
17+
struct inetpeer_addr {
1818
union {
1919
__be32 a4;
2020
__be32 a6[4];
2121
};
2222
__u16 family;
23-
} inet_peer_address_t;
23+
};
2424

2525
struct inet_peer {
2626
/* group together avl_left,avl_right,v4daddr to speedup lookups */
2727
struct inet_peer __rcu *avl_left, *avl_right;
28-
inet_peer_address_t daddr;
28+
struct inetpeer_addr daddr;
2929
__u32 avl_height;
3030
struct list_head unused;
3131
__u32 dtime; /* the time of last use of not
@@ -51,11 +51,11 @@ struct inet_peer {
5151
void inet_initpeers(void) __init;
5252

5353
/* can be called with or without local BH being disabled */
54-
struct inet_peer *inet_getpeer(inet_peer_address_t *daddr, int create);
54+
struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create);
5555

5656
static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
5757
{
58-
inet_peer_address_t daddr;
58+
struct inetpeer_addr daddr;
5959

6060
daddr.a4 = v4daddr;
6161
daddr.family = AF_INET;
@@ -64,7 +64,7 @@ static inline struct inet_peer *inet_getpeer_v4(__be32 v4daddr, int create)
6464

6565
static inline struct inet_peer *inet_getpeer_v6(struct in6_addr *v6daddr, int create)
6666
{
67-
inet_peer_address_t daddr;
67+
struct inetpeer_addr daddr;
6868

6969
ipv6_addr_copy((struct in6_addr *)daddr.a6, v6daddr);
7070
daddr.family = AF_INET6;

net/ipv4/inetpeer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,8 @@ static void unlink_from_unused(struct inet_peer *p)
161161
}
162162
}
163163

164-
static int addr_compare(const inet_peer_address_t *a,
165-
const inet_peer_address_t *b)
164+
static int addr_compare(const struct inetpeer_addr *a,
165+
const struct inetpeer_addr *b)
166166
{
167167
int i, n = (a->family == AF_INET ? 1 : 4);
168168

@@ -211,7 +211,7 @@ static int addr_compare(const inet_peer_address_t *a,
211211
* But every pointer we follow is guaranteed to be valid thanks to RCU.
212212
* We exit from this function if number of links exceeds PEER_MAXDEPTH
213213
*/
214-
static struct inet_peer *lookup_rcu_bh(const inet_peer_address_t *daddr,
214+
static struct inet_peer *lookup_rcu_bh(const struct inetpeer_addr *daddr,
215215
struct inet_peer_base *base)
216216
{
217217
struct inet_peer *u = rcu_dereference_bh(base->root);
@@ -472,7 +472,7 @@ static int cleanup_once(unsigned long ttl)
472472
}
473473

474474
/* Called with or without local BH being disabled. */
475-
struct inet_peer *inet_getpeer(inet_peer_address_t *daddr, int create)
475+
struct inet_peer *inet_getpeer(struct inetpeer_addr *daddr, int create)
476476
{
477477
struct inet_peer __rcu **stack[PEER_MAXDEPTH], ***stackptr;
478478
struct inet_peer_base *base = family_to_base(AF_INET);

0 commit comments

Comments
 (0)