Patrick McHardy
3b6b9fab42
netfilter: nf_conntrack_sip: pass data offset to NAT functions ...
When using TCP multiple SIP messages might be present in a single packet.
A following patch will parse them by setting the dptr to the beginning of
each message. The NAT helper needs to reload the dptr value after mangling
the packet however, so it needs to know the offset of the message to the
beginning of the packet.
Signed-off-by: Patrick McHardy <kaber@trash.net>
2010-02-11 12:23:53 +01:00
Merge branch 'bugzilla-14483' into release
2010-01-20 01:14:50 -05:00
fix up O_SYNC comments
2009-12-17 11:03:24 -05:00
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
2010-01-11 09:46:20 -08:00
netfilter: nf_conntrack_sip: pass data offset to NAT functions
2010-02-11 12:23:53 +01:00
V4L/DVB (13670): soc-camera: Add mt9t112 camera driver
2009-12-16 09:27:41 -02:00
netfilter: nf_conntrack: show helper and class in /proc/net/nf_conntrack_expect
2010-02-11 12:22:48 +01:00
Merge branches 'amso1100', 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'iser', 'misc', 'mlx4' and 'nes' into for-next
2009-12-15 23:39:25 -08:00
libsrp: fix compile failure
2009-12-30 12:23:27 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
tracing: Fix sign fields in ftrace_define_fields_##call()
2009-12-30 10:27:06 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
2009-12-16 10:29:52 -08:00
3b6b9fab42