diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 10:37:43 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2016-09-26 10:37:43 -0700 |
| commit | 734bcf32c23442e81891641ae05e08108a4010d5 (patch) | |
| tree | b41cc318506b0c38ddf404520ba67753f3ab5452 /net/tipc/udp_media.c | |
| parent | 551569f25ec07596e144ffbc7911dd631645e63b (diff) | |
| parent | 8d5e93bb8c9c48ee5948f6b1aff0e895381f09e6 (diff) | |
Merge tag 'v4.4.22' into android-4.4.y
This is the 4.4.22 stable release
Change-Id: Id49e3c87d2cacb2fa85d85a17226f718f4a5ac28
Diffstat (limited to 'net/tipc/udp_media.c')
| -rw-r--r-- | net/tipc/udp_media.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/tipc/udp_media.c b/net/tipc/udp_media.c index 70c03271b798..6af78c6276b4 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 @@ -224,10 +223,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) { |