redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

[IPV4]: Consolidate the ip cork destruction in ip_output.c

Browse source 
The ip_push_pending_frames and ip_flush_pending_frames do the
same things to flush the sock's cork. Move this into a separate
function and save ~80 bytes from the .text

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-11-05 21:03:24 -08:00 committed by David S. Miller
parent e011ff48ab
commit 429f08e950
1 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
net/ipv4/ip_output.c
View file

@ -1183,6 +1183,17 @@ error:
return err; return err;
} }
static void ip_cork_release(struct inet_sock *inet)
{
inet->cork.flags &= ~IPCORK_OPT;
kfree(inet->cork.opt);
inet->cork.opt = NULL;
if (inet->cork.rt) {
ip_rt_put(inet->cork.rt);
inet->cork.rt = NULL;
}
}
/* /*
* Combined all pending IP fragments on the socket as one IP datagram * Combined all pending IP fragments on the socket as one IP datagram
* and push them out. * and push them out.
@ -1276,13 +1287,7 @@ int ip_push_pending_frames(struct sock *sk)
} }
out: out:
inet->cork.flags &= ~IPCORK_OPT; ip_cork_release(inet);
kfree(inet->cork.opt);
inet->cork.opt = NULL;
if (inet->cork.rt) {
ip_rt_put(inet->cork.rt);
inet->cork.rt = NULL;
}
return err; return err;
error: error:
@ -1295,19 +1300,12 @@ error:
*/ */
void ip_flush_pending_frames(struct sock *sk) void ip_flush_pending_frames(struct sock *sk)
{ {
struct inet_sock *inet = inet_sk(sk);
struct sk_buff *skb; struct sk_buff *skb;
while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL) while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL)
kfree_skb(skb); kfree_skb(skb);
inet->cork.flags &= ~IPCORK_OPT; ip_cork_release(inet_sk(sk));
kfree(inet->cork.opt);
inet->cork.opt = NULL;
if (inet->cork.rt) {
ip_rt_put(inet->cork.rt);
inet->cork.rt = NULL;
}
} }