Merge branch 'udp_tunnel_sk'
authorDavid S. Miller <davem@davemloft.net>
Tue, 7 Apr 2015 19:29:30 +0000 (15:29 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Apr 2015 19:29:30 +0000 (15:29 -0400)
commite0e8db2f89bac4529fa12dde2595d6295e313952
tree8cfacda45a2b3d12a3831511199a13d33f245890
parenta3786a5ff7551d03029219f93306106d0a6bdf55
parent79b16aadea32cce077acbe9e229fcb58a7801687
Merge branch 'udp_tunnel_sk'

Prevent UDP tunnels from operating on garbage socket

So this should do the rest of the work such that when we encapsulate
into a UDP tunnel, the output path works on the UDP tunnel's socket
rather than skb->sk.

Part of this work is based upon changes done by Jiri Pirko some time
ago.

Basically the first step is to pass the socket through the nf_hook
okfn(), and then next we do the same for the UDP tunnel xmit routines.

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