netfilter: Add socket pointer to nf_hook_state.
authorDavid Miller <davem@davemloft.net>
Mon, 6 Apr 2015 02:19:00 +0000 (22:19 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 7 Apr 2015 19:25:55 +0000 (15:25 -0400)
It is currently always set to NULL, but nf_queue is adjusted to be
prepared for it being set to a real socket by taking and releasing a
reference to that socket when necessary.

Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/netfilter.h
net/netfilter/nf_queue.c

Simple merge
Simple merge