diff options
author | Joe Perches <joe@perches.com> | 2014-05-13 23:30:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-05-14 16:07:23 -0400 |
commit | c7228317441f4dee5e5916e30300dd8c61f75af7 (patch) | |
tree | d1a2183e764d0c424bd44f41ea4e1db9937be84c /net/ipv4/inet_hashtables.c | |
parent | 126e612223c885a8718839d97c67473503bea58a (diff) |
net: Use a more standard macro for INET_ADDR_COOKIE
Missing a colon on definition use is a bit odd so
change the macro for the 32 bit case to declare an
__attribute__((unused)) and __deprecated variable.
The __deprecated attribute will cause gcc to emit
an error if the variable is actually used.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
-rw-r--r-- | net/ipv4/inet_hashtables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 83331f1b86ac..43116e8c8e13 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
@@ -274,7 +274,7 @@ struct sock *__inet_lookup_established(struct net *net, | |||
274 | const __be32 daddr, const u16 hnum, | 274 | const __be32 daddr, const u16 hnum, |
275 | const int dif) | 275 | const int dif) |
276 | { | 276 | { |
277 | INET_ADDR_COOKIE(acookie, saddr, daddr) | 277 | INET_ADDR_COOKIE(acookie, saddr, daddr); |
278 | const __portpair ports = INET_COMBINED_PORTS(sport, hnum); | 278 | const __portpair ports = INET_COMBINED_PORTS(sport, hnum); |
279 | struct sock *sk; | 279 | struct sock *sk; |
280 | const struct hlist_nulls_node *node; | 280 | const struct hlist_nulls_node *node; |
@@ -327,7 +327,7 @@ static int __inet_check_established(struct inet_timewait_death_row *death_row, | |||
327 | __be32 daddr = inet->inet_rcv_saddr; | 327 | __be32 daddr = inet->inet_rcv_saddr; |
328 | __be32 saddr = inet->inet_daddr; | 328 | __be32 saddr = inet->inet_daddr; |
329 | int dif = sk->sk_bound_dev_if; | 329 | int dif = sk->sk_bound_dev_if; |
330 | INET_ADDR_COOKIE(acookie, saddr, daddr) | 330 | INET_ADDR_COOKIE(acookie, saddr, daddr); |
331 | const __portpair ports = INET_COMBINED_PORTS(inet->inet_dport, lport); | 331 | const __portpair ports = INET_COMBINED_PORTS(inet->inet_dport, lport); |
332 | struct net *net = sock_net(sk); | 332 | struct net *net = sock_net(sk); |
333 | unsigned int hash = inet_ehashfn(net, daddr, lport, | 333 | unsigned int hash = inet_ehashfn(net, daddr, lport, |