Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5fed159 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP]: ditch dccp_v[46]_ctl_send_ack 



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

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 118b2c95

net/dccp/ipv4.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -197,7 +197,8 @@ static inline void dccp_do_pmtu_discovery(struct sock *sk, 
	} /* else let the usual retransmit timer handle it */

	} /* 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;

	int err;

	struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;

	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,

static int dccp_v4_send_response(struct sock *sk, struct request_sock *req,

				 struct dst_entry *dst)

				 struct dst_entry *dst)

{

{

net/dccp/ipv6.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -580,7 +580,8 @@ static void dccp_v6_ctl_send_reset(struct sk_buff *rxskb) 
	kfree_skb(skb);

	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 flowi fl;

	struct dccp_hdr *rxdh = dccp_hdr(rxskb), *dh;

	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);

	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)

static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb)

{

{

	const struct dccp_hdr *dh = dccp_hdr(skb);

	const struct dccp_hdr *dh = dccp_hdr(skb);