udp: expose inet cork to udp

UDP segmentation offload needs access to inet_cork in the udp layer.
Pass the struct to ip(6)_make_skb instead of allocating it on the
stack in that function itself.

This patch is a noop otherwise.

Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 9 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 83c73bab2c3d..2883ff1e909c 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -1470,9 +1470,8 @@ struct sk_buff *ip_make_skb(struct sock *sk,
                                         int len, int odd, struct sk_buff *skb),
                             void *from, int length, int transhdrlen,
                             struct ipcm_cookie *ipc, struct rtable **rtp,
-                            unsigned int flags)
+                            struct inet_cork *cork, unsigned int flags)
 {
-        struct inet_cork cork;
         struct sk_buff_head queue;
         int err;
 
@@ -1481,22 +1480,22 @@ struct sk_buff *ip_make_skb(struct sock *sk,
 
         __skb_queue_head_init(&queue);
 
-        cork.flags = 0;
-        cork.addr = 0;
-        cork.opt = NULL;
-        err = ip_setup_cork(sk, &cork, ipc, rtp);
+        cork->flags = 0;
+        cork->addr = 0;
+        cork->opt = NULL;
+        err = ip_setup_cork(sk, cork, ipc, rtp);
         if (err)
                 return ERR_PTR(err);
 
-        err = __ip_append_data(sk, fl4, &queue, &cork,
+        err = __ip_append_data(sk, fl4, &queue, cork,
                                &current->task_frag, getfrag,
                                from, length, transhdrlen, flags);
         if (err) {
-                __ip_flush_pending_frames(sk, &queue, &cork);
+                __ip_flush_pending_frames(sk, &queue, cork);
                 return ERR_PTR(err);
         }
 
-        return __ip_make_skb(sk, fl4, &queue, &cork);
+        return __ip_make_skb(sk, fl4, &queue, cork);
 }
 
 /*