Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[UDP]: saddr_cmp function should take const socket pointers

Browse source 
This also kills a warning while building ipv6:

net/ipv6/udp.c: In function ‘udp_v6_get_port’:
net/ipv6/udp.c:66: warning: passing argument 3 of ‘udp_get_port’ from incompatible pointer type

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2006-08-26 20:10:15 -07:00
parent bed53ea7fe
commit e3b4eadbea
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/udp.h
View file

@ -48,7 +48,7 @@ extern struct proto udp_prot;
struct sk_buff; struct sk_buff;
extern int udp_get_port(struct sock *sk, unsigned short snum, extern int udp_get_port(struct sock *sk, unsigned short snum,
int (*saddr_cmp)(struct sock *, struct sock *)); int (*saddr_cmp)(const struct sock *, const struct sock *));
extern void udp_err(struct sk_buff *, u32); extern void udp_err(struct sk_buff *, u32);
extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk, extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk,

4
net/ipv4/udp.c
View file

@ -139,7 +139,7 @@ static inline int udp_lport_inuse(u16 num)
* @saddr_comp: AF-dependent comparison of bound local IP addresses * @saddr_comp: AF-dependent comparison of bound local IP addresses
*/ */
int udp_get_port(struct sock *sk, unsigned short snum, int udp_get_port(struct sock *sk, unsigned short snum,
int (*saddr_cmp)(struct sock *sk1, struct sock *sk2)) int (*saddr_cmp)(const struct sock *sk1, const struct sock *sk2))
{ {
struct hlist_node *node; struct hlist_node *node;
struct hlist_head *head; struct hlist_head *head;
@ -210,7 +210,7 @@ int udp_get_port(struct sock *sk, unsigned short snum,
return error; return error;
} }
static inline int ipv4_rcv_saddr_equal(struct sock *sk1, struct sock *sk2) static inline int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
{ {
struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2);