From: David S. Miller Date: Mon, 11 Apr 2016 19:31:34 +0000 (-0400) Subject: Merge branch 'udp-pull' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c64a73d584cc344915baee1183c791c0d0c42d79;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'udp-pull' Willem de Bruijn says: ==================== net: fix udp pull header breakage Commit e6afc8ace6dd ("udp: remove headers from UDP packets before queueing") modified udp receive processing to pull headers before enqueue and to not expect them on dequeue. The patch missed protocols on top of udp with in-kernel implementations that have their own skb_recv_datagram calls and dequeue logic. Modify these datapaths to also no longer expect a udp header at skb->data. Sunrpc and rxrpc are the only two protocols that call this function and contain references to udphr (some others, like tipc, are based on encap_rcv, which acts before enqueue, before the the header pull). ==================== Signed-off-by: David S. Miller --- c64a73d584cc344915baee1183c791c0d0c42d79