aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/ipv4.c
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2006-08-09 18:47:12 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 17:54:14 -0400
commit8f491069b40be5d627007a343f99759e9da6a178 (patch)
treeba2be735de32fa30015fe22febf4329c8e79ca25 /net/dccp/ipv4.c
parent832b4c5e184391773e462653aa862a8cab71f38d (diff)
[IPV4]: Use network-order dport for all visible inet_lookup_*
Right now most inet_lookup_* functions take a host-order hnum instead of a network-order dport because that's how it is represented internally. This means that users of these functions have to be careful about using the right byte-order. To add more confusion, inet_lookup takes a network-order dport unlike all other functions. So this patch changes all visible inet_lookup functions to take a dport and move all dport->hnum conversion inside them. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/ipv4.c')
-rw-r--r--net/dccp/ipv4.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index 171d363876ee..9a1a76a7dc41 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -608,10 +608,10 @@ static struct sock *dccp_v4_hnd_req(struct sock *sk, struct sk_buff *skb)
608 if (req != NULL) 608 if (req != NULL)
609 return dccp_check_req(sk, skb, req, prev); 609 return dccp_check_req(sk, skb, req, prev);
610 610
611 nsk = __inet_lookup_established(&dccp_hashinfo, 611 nsk = inet_lookup_established(&dccp_hashinfo,
612 iph->saddr, dh->dccph_sport, 612 iph->saddr, dh->dccph_sport,
613 iph->daddr, ntohs(dh->dccph_dport), 613 iph->daddr, dh->dccph_dport,
614 inet_iif(skb)); 614 inet_iif(skb));
615 if (nsk != NULL) { 615 if (nsk != NULL) {
616 if (nsk->sk_state != DCCP_TIME_WAIT) { 616 if (nsk->sk_state != DCCP_TIME_WAIT) {
617 bh_lock_sock(nsk); 617 bh_lock_sock(nsk);
@@ -925,7 +925,7 @@ static int dccp_v4_rcv(struct sk_buff *skb)
925 * Look up flow ID in table and get corresponding socket */ 925 * Look up flow ID in table and get corresponding socket */
926 sk = __inet_lookup(&dccp_hashinfo, 926 sk = __inet_lookup(&dccp_hashinfo,
927 skb->nh.iph->saddr, dh->dccph_sport, 927 skb->nh.iph->saddr, dh->dccph_sport,
928 skb->nh.iph->daddr, ntohs(dh->dccph_dport), 928 skb->nh.iph->daddr, dh->dccph_dport,
929 inet_iif(skb)); 929 inet_iif(skb));
930 930
931 /* 931 /*