Pablo Neira Ayuso
544d5c7d9f
netfilter: ctnetlink: allow to set expectfn for expectations ...
This patch allows you to set expectfn which is specifically used
by the NAT side of most of the existing conntrack helpers.
I have added a symbol map that uses a string as key to look up for
the function that is attached to the expectation object. This is
the best solution I came out with to solve this issue.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2012-03-07 17:40:46 +01:00
Merge branches 'atomicio-apei', 'hotplug', 'sony-nvs-nosave' and 'thermal-netlink' into release
2012-01-23 19:47:06 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-03-05 21:16:26 -05:00
drm/exynos: exynos_drm.h header file fixes
2012-02-15 10:29:12 +09:00
keys: add a "logon" key type
2012-01-17 22:39:40 -06:00
netfilter: ctnetlink: allow to set expectfn for expectations
2012-03-07 17:40:46 +01:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-01-18 12:53:54 -08:00
netfilter: ctnetlink: allow to set expectfn for expectations
2012-03-07 17:40:46 +01:00
[SCSI] libfc: Declare local functions static
2012-01-16 12:45:48 +04:00
Merge branch 'fix/asoc' into for-linus
2012-01-31 15:13:14 +01:00
target: Change target_submit_cmd() to return void
2012-02-07 06:41:04 +00:00
sched/events: Revert trace_sched_stat_sleeptime()
2012-02-22 12:06:55 +01:00
fbdev fixes for 3.3
2012-02-07 15:54:02 -08:00
Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block
2012-01-15 12:48:41 -08:00
544d5c7d9f