diff --git a/[refs] b/[refs] index ab26453bec8a..9c0d03ec8c75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c4e18dade1f878db33ed38927de22e63d550970d +refs/heads/master: a067d9ac39cd207b5a0994c73199a56e7d5a17a3 diff --git a/trunk/net/ipv4/ip_output.c b/trunk/net/ipv4/ip_output.c index 6dd1d9c5d52e..8950d18001f1 100644 --- a/trunk/net/ipv4/ip_output.c +++ b/trunk/net/ipv4/ip_output.c @@ -1341,8 +1341,6 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset, * * Should run single threaded per socket because it uses the sock * structure to pass arguments. - * - * LATER: switch from ip_build_xmit to ip_append_* */ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg, unsigned int len)