Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-09-22 12:42:50 +00:00
Code Issues Projects Releases Wiki Activity

[DCCP]: ditch dccp_v[46]_ctl_send_ack

Browse source 
Merging it with its only user: dccp_v[46]_reqsk_send_ack.

Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Arnaldo Carvalho de Melo 2006-03-20 22:31:26 -08:00 committed by David S. Miller
parent 118b2c9532
commit c5fed1597e
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
net/dccp/ipv4.c
View file

@ -197,7 +197,8 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk,
} /* else let the usual retransmit timer handle it */
}
static void dccp_v4_ctl_send_ack(struct sk_buff *rxskb)
static void dccp_v4_reqsk_send_ack(struct sk_buff *rxskb,
struct request_sock *req)
{
int err;
struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;
@ -245,12 +246,6 @@ static void dccp_v4_ctl_send_ack(struct sk_buff *rxskb)
}
}
static void dccp_v4_reqsk_send_ack(struct sk_buff *skb,
struct request_sock *req)
{
dccp_v4_ctl_send_ack(skb);
}
static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,
struct dst_entry *dst)
{

9
net/dccp/ipv6.c
View file

@ -580,7 +580,8 @@ static void dccp_v6_ctl_send_reset(struct sk_buff *rxskb)
kfree_skb(skb);
}
static void dccp_v6_ctl_send_ack(struct sk_buff *rxskb)
static void dccp_v6_reqsk_send_ack(struct sk_buff *rxskb,
struct request_sock *req)
{
struct flowi fl;
struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;
@ -633,12 +634,6 @@ static void dccp_v6_ctl_send_ack(struct sk_buff *rxskb)
kfree_skb(skb);
}
static void dccp_v6_reqsk_send_ack(struct sk_buff *skb,
struct request_sock *req)
{
dccp_v6_ctl_send_ack(skb);
}
static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb)
{
const struct dccp_hdr *dh = dccp_hdr(skb);