3 files changed, 9 insertions, 2 deletions

diff --git a/include/net/udp.h b/include/net/udp.h
index 065f379c6503..ad99eedc6168 100644
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -181,6 +181,7 @@ extern int udp_get_port(struct sock *sk, unsigned short snum,
 extern void udp_err(struct sk_buff *, u32);
 extern int udp_sendmsg(struct kiocb *iocb, struct sock *sk,
                             struct msghdr *msg, size_t len);
+extern int udp_push_pending_frames(struct sock *sk);
 extern void udp_flush_pending_frames(struct sock *sk);
 extern int udp_rcv(struct sk_buff *skb);
 extern int udp_ioctl(struct sock *sk, int cmd, unsigned long arg);
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 0bf5d399a03c..93b731d53221 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -799,7 +799,7 @@ send:
 /*
  * Push out all pending data as one UDP datagram. Socket is locked.
  */
-static int udp_push_pending_frames(struct sock *sk)
+int udp_push_pending_frames(struct sock *sk)
 {
         struct udp_sock  *up = udp_sk(sk);
         struct inet_sock *inet = inet_sk(sk);
@@ -818,6 +818,7 @@ out:
         up->pending = 0;
         return err;
 }
+EXPORT_SYMBOL(udp_push_pending_frames);
 
 int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
                 size_t len)
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index 42923b14dfa6..e7b28f9bb02b 100644
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -955,11 +955,16 @@ static int udp_v6_push_pending_frames(struct sock *sk)
         struct udphdr *uh;
         struct udp_sock  *up = udp_sk(sk);
         struct inet_sock *inet = inet_sk(sk);
-        struct flowi6 *fl6 = &inet->cork.fl.u.ip6;
+        struct flowi6 *fl6;
         int err = 0;
         int is_udplite = IS_UDPLITE(sk);
         __wsum csum = 0;
 
+        if (up->pending == AF_INET)
+                return udp_push_pending_frames(sk);
+
+        fl6 = &inet->cork.fl.u.ip6;
+
         /* Grab the skbuff where UDP header space exists. */
         if ((skb = skb_peek(&sk->sk_write_queue)) == NULL)
                 goto out;