Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv6/xfrm6_output.c
	net/openvswitch/flow_netlink.c
	net/openvswitch/vport-gre.c
	net/openvswitch/vport-vxlan.c
	net/openvswitch/vport.c
	net/openvswitch/vport.h

The openvswitch conflicts were overlapping changes.  One was
the egress tunnel info fix in 'net' and the other was the
vport ->send() op simplification in 'net-next'.

The xfrm6_output.c conflicts was also a simplification
overlapping a bug fix.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 9 insertions, 3 deletions

diff --git a/net/tipc/msg.c b/net/tipc/msg.c
index 454f5ec275c8..26d38b3d8760 100644
--- a/net/tipc/msg.c
+++ b/net/tipc/msg.c
@@ -121,7 +121,7 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
 {
         struct sk_buff *head = *headbuf;
         struct sk_buff *frag = *buf;
-        struct sk_buff *tail;
+        struct sk_buff *tail = NULL;
         struct tipc_msg *msg;
         u32 fragid;
         int delta;
@@ -141,9 +141,15 @@ int tipc_buf_append(struct sk_buff **headbuf, struct sk_buff **buf)
                 if (unlikely(skb_unclone(frag, GFP_ATOMIC)))
                         goto err;
                 head = *headbuf = frag;
-                skb_frag_list_init(head);
-                TIPC_SKB_CB(head)->tail = NULL;
                 *buf = NULL;
+                TIPC_SKB_CB(head)->tail = NULL;
+                if (skb_is_nonlinear(head)) {
+                        skb_walk_frags(head, tail) {
+                                TIPC_SKB_CB(head)->tail = tail;
+                        }
+                } else {
+                        skb_frag_list_init(head);
+                }
                 return 0;
         }