3 files changed, 15 insertions, 11 deletions

diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h
index 69b4bcf880c9..028eaea1c854 100644
--- a/include/net/ip6_tunnel.h
+++ b/include/net/ip6_tunnel.h
@@ -158,9 +158,12 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb,
         memset(skb->cb, 0, sizeof(struct inet6_skb_parm));
         pkt_len = skb->len - skb_inner_network_offset(skb);
         err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb);
-        if (unlikely(net_xmit_eval(err)))
-                pkt_len = -1;
-        iptunnel_xmit_stats(dev, pkt_len);
+
+        if (dev) {
+                if (unlikely(net_xmit_eval(err)))
+                        pkt_len = -1;
+                iptunnel_xmit_stats(dev, pkt_len);
+        }
 }
 #endif
 #endif
diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 9e3846388fb3..1452a97914a0 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -76,9 +76,12 @@ void iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
         __ip_select_ident(net, iph, skb_shinfo(skb)->gso_segs ?: 1);
 
         err = ip_local_out(net, sk, skb);
-        if (unlikely(net_xmit_eval(err)))
-                pkt_len = 0;
-        iptunnel_xmit_stats(dev, pkt_len);
+
+        if (dev) {
+                if (unlikely(net_xmit_eval(err)))
+                        pkt_len = 0;
+                iptunnel_xmit_stats(dev, pkt_len);
+        }
 }
 EXPORT_SYMBOL_GPL(iptunnel_xmit);
 
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index 7fc02d84c4f1..1405ccc9101c 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -176,7 +176,6 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb,
                         goto tx_error;
                 }
 
-                skb->dev = rt->dst.dev;
                 ttl = ip4_dst_hoplimit(&rt->dst);
                 udp_tunnel_xmit_skb(rt, ub->ubsock->sk, skb, src->ipv4.s_addr,
                                     dst->ipv4.s_addr, 0, ttl, 0, src->port,
@@ -195,10 +194,9 @@ static int tipc_udp_xmit(struct net *net, struct sk_buff *skb,
                 if (err)
                         goto tx_error;
                 ttl = ip6_dst_hoplimit(ndst);
-                err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb,
-                                           ndst->dev, &src->ipv6,
-                                           &dst->ipv6, 0, ttl, 0, src->port,
-                                           dst->port, false);
+                err = udp_tunnel6_xmit_skb(ndst, ub->ubsock->sk, skb, NULL,
+                                           &src->ipv6, &dst->ipv6, 0, ttl, 0,
+                                           src->port, dst->port, false);
 #endif
         }
         return err;