1 files changed, 8 insertions, 16 deletions

diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c
index ad2719ad4c1b..d63a911e7fe2 100644
--- a/net/tipc/udp_media.c
+++ b/net/tipc/udp_media.c
@@ -48,7 +48,6 @@
 #include <linux/tipc_netlink.h>
 #include "core.h"
 #include "bearer.h"
-#include "msg.h"
 
 /* IANA assigned UDP port */
 #define UDP_PORT_DEFAULT        6118
@@ -158,8 +157,11 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
         struct udp_media_addr *src = (struct udp_media_addr *)&b->addr.value;
         struct rtable *rt;
 
-        if (skb_headroom(skb) < UDP_MIN_HEADROOM)
-                pskb_expand_head(skb, UDP_MIN_HEADROOM, 0, GFP_ATOMIC);
+        if (skb_headroom(skb) < UDP_MIN_HEADROOM) {
+                err = pskb_expand_head(skb, UDP_MIN_HEADROOM, 0, GFP_ATOMIC);
+                if (err)
+                        goto tx_error;
+        }
 
         skb_set_inner_protocol(skb, htons(ETH_P_TIPC));
         ub = rcu_dereference_rtnl(b->media_ptr);
@@ -180,15 +182,9 @@ static int tipc_udp_send_msg(struct net *net, struct sk_buff *skb,
                         goto tx_error;
                 }
                 ttl = ip4_dst_hoplimit(&rt->dst);
-                err = udp_tunnel_xmit_skb(rt, ub->ubsock->sk, skb,
-                                          src->ipv4.s_addr,
-                                          dst->ipv4.s_addr, 0, ttl, 0,
-                                          src->udp_port, dst->udp_port,
-                                          false, true);
-                if (err < 0) {
-                        ip_rt_put(rt);
-                        goto tx_error;
-                }
+                udp_tunnel_xmit_skb(rt, ub->ubsock->sk, skb, src->ipv4.s_addr,
+                                    dst->ipv4.s_addr, 0, ttl, 0, src->udp_port,
+                                    dst->udp_port, false, true);
 #if IS_ENABLED(CONFIG_IPV6)
         } else {
                 struct dst_entry *ndst;
@@ -221,10 +217,6 @@ static int tipc_udp_recv(struct sock *sk, struct sk_buff *skb)
 {
         struct udp_bearer *ub;
         struct tipc_bearer *b;
-        int usr = msg_user(buf_msg(skb));
-
-        if ((usr == LINK_PROTOCOL) || (usr == NAME_DISTRIBUTOR))
-                skb_linearize(skb);
 
         ub = rcu_dereference_sk_user_data(sk);
         if (!ub) {