Florian Westphal
e70deecbf8
netfilter: bridge: don't use nf_bridge_info data to store mac header ...
br_netfilter maintains an extra state, nf_bridge_info, which is attached
to skb via skb->nf_bridge pointer.
Amongst other things we use skb->nf_bridge->data to store the original
mac header for every processed skb.
This is required for ip refragmentation when using conntrack
on top of bridge, because ip_fragment doesn't copy it from original skb.
However there is no need anymore to do this unconditionally.
Move this to the one place where its needed -- when br_netfilter calls
ip_fragment().
Also switch to percpu storage for this so we can handle fragmenting
without accessing nf_bridge meta data.
Only user left is neigh resolution when DNAT is detected, to hold
the original source mac address (neigh resolution builds new mac header
using bridge mac), so rename ->data and reduce its size to whats needed.
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
2015-04-08 16:49:07 +02:00
bcma: move internal function declarations to private header
2015-03-05 14:11:43 +02:00
can: add combined rx/tx LED trigger support
2015-03-22 23:50:11 +01:00
libceph: tcp_nodelay support
2015-02-19 13:31:40 +03:00
fsl /bestcomm
irqchip: gicv3-its: Define macros for GITS_CTLR fields
2015-03-08 05:34:35 +00:00
Changes to existing drivers:
2015-02-18 09:05:48 -08:00
net/mlx4_en: Add Flow control statistics display via ethtool
2015-03-31 16:36:51 -04:00
MTD updates for 3.20-rc1
2015-02-18 08:01:44 -08:00
netlink: implement nla_put_in_addr and nla_put_in6_addr
2015-03-31 13:58:35 -04:00
Revert "pinctrl: consumer: use correct retval for placeholder functions"
2015-03-05 10:08:14 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-02-21 12:59:04 -08:00
rtc: add driver for DS1685 family of real time clocks
2015-02-16 17:56:05 -08:00
soc /ti
cc2520: Add support for CC2591 amplifier.
2015-03-18 17:50:25 +01:00
Merge branch 'cleanups'
2015-02-18 07:28:37 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-03-09 23:38:02 -04:00
Merge branch 'getname2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 15:27:47 -08:00
Merge branch 'lazytime' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-02-17 16:12:34 -08:00
watchdog: bcm47xx_wdt.c: add restart handler support
2015-02-17 21:33:27 +01:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
Merge branch 'for-3.20/core' of git://git.kernel.dk/linux-block
2015-02-12 14:13:23 -08:00
tc: bpf: generalize pedit action
2015-03-29 13:26:54 -07:00
net: phy: bcm7xxx: add alternate id for 7439
2015-03-09 23:57:54 -04:00
clk: Add __clk_hw_set_clk helper function
2015-02-18 09:40:07 -08:00
clk: introduce clk_is_match
2015-03-11 15:56:59 -07:00
compiler: introduce __alias(symbol) shortcut
2015-02-13 21:21:40 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kasan: enable instrumentation of global variables
2015-02-13 21:21:42 -08:00
kernel: make READ_ONCE() valid on const arguments
2015-02-21 10:27:33 -08:00
cpuidle / sleep: Use broadcast timer for states that stop local timer
2015-03-05 23:13:19 +01:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
lib/halfmd4.c: simplify includes
2015-02-12 18:54:15 -08:00
VFS: Split DCACHE_FILE_TYPE into regular and special types
2015-02-22 11:38:38 -05:00
ipv4: dccp: handle ICMP messages on DCCP_NEW_SYN_RECV request sockets
2015-03-23 16:52:26 -04:00
debugfs: Provide a file creation function that also takes an initial size
2015-02-17 12:21:51 -05:00
dm snapshot: suspend merging snapshot when doing exception handover
2015-02-27 14:53:16 -05:00
net: Kill dev_rebuild_header
2015-03-02 16:43:41 -05:00
filter: introduce SKF_AD_VLAN_TPID BPF extension
2015-03-24 15:25:15 -04:00
File locking related fixes for v3.20 (pile #2 )
2015-02-18 10:21:47 -08:00
The updates included in this pull request for ftrace are:
2015-02-12 08:37:41 -08:00
HID: hid-sensor-hub: Correct documentation
2015-02-17 13:34:44 +01:00
mm: numa: do not trap faults on the huge zero page
2015-02-12 18:54:08 -08:00
Merge branch 'i2c/for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2015-02-21 12:41:50 -08:00
mac802154: correct max sifs size handling
2015-03-14 17:11:30 +01:00
bridge: Extend Proxy ARP design to allow optional rules for Wi-Fi
2015-03-05 14:52:23 -05:00
pppoe: Use workqueue to die properly when a PADT is received
2015-03-02 00:17:31 -05:00
net: Move check for multiple vlans to drivers
2015-03-29 13:33:22 -07:00
ipv4, ipv6: kill ip_mc_{join, leave}_group and ipv6_sock_mc_{join, drop}
2015-03-18 22:05:09 -04:00
inet_diag: add const to inet_diag_req_v2
2015-03-10 13:45:28 -04:00
kasan: enable stack instrumentation
2015-02-13 21:21:41 -08:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
ipv6: introduce secret_stable to ipv6_devconf
2015-03-23 22:12:08 -04:00
genirq / PM: Add flag for shared NO_SUSPEND interrupt lines
2015-03-04 21:42:19 +01:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
kdb: Avoid printing KERN_ levels to consoles
2015-02-19 12:39:02 -06:00
kernel.h: remove ancient __FUNCTION__ hack
2015-02-12 18:54:13 -08:00
kernfs: remove KERNFS_STATIC_NAME
2015-02-13 21:21:36 -08:00
kexec: add IND_FLAGS macro
2015-02-17 14:34:51 -08:00
Fairly small update, but there are some interesting new features.
2015-02-13 09:55:09 -08:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
memcg: reparent list_lrus and free kmemcg_id on css offline
2015-02-12 18:54:10 -08:00
list_lru: introduce per-memcg lists
2015-02-12 18:54:09 -08:00
mm: numa: do not dereference pmd outside of the lock during NUMA hinting fault
2015-02-12 18:54:08 -08:00
mm: allow page fault handlers to perform the COW
2015-02-16 17:56:03 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-02-17 17:41:19 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
2015-03-18 10:46:39 -07:00
kasan, module: move MODULE_ALIGN macro into <linux/moduleloader.h>
2015-03-12 18:46:08 -07:00
mutex: remove unused field "name" in debug mode
2015-02-14 11:32:59 -08:00
net: Remove iocb argument from sendmsg and recvmsg
2015-03-02 13:06:31 -05:00
net: Introduce passthru_features_check
2015-03-29 13:33:22 -07:00
netfilter: bridge: kill nf_bridge_pad
2015-03-22 19:45:55 +01:00
Merge branch 'for-3.20' of git://linux-nfs.org/~bfields/linux
2015-02-12 10:39:41 -08:00
NFS: Fix a regression in the read() syscall
2015-03-03 13:02:29 -05:00
NFSv4.1: Clean up bind_conn_to_session
2015-02-18 13:11:09 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
NVMe: Fix potential corruption during shutdown
2015-02-19 16:15:37 -07:00
of: mdio: export of_mdio_parse_addr
2015-03-11 17:56:28 -04:00
net: core: add of_find_net_device_by_node()
2015-03-09 23:50:20 -04:00
of/platform: Fix sparc:allmodconfig build
2015-03-13 09:45:24 -05:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-16 14:58:12 -08:00
hexdump: make it return number of bytes placed in buffer
2015-02-12 18:54:15 -08:00
ptp: remove 32 bit get/set methods.
2015-03-31 12:01:19 -04:00
lib/rbtree.c: fix typo in comment
2015-02-17 14:34:52 -08:00
rhashtable: provide len to obj_hashfn
2015-03-25 17:18:33 +01:00
vfs: remove get_xip_mem
2015-02-16 17:56:03 -08:00
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-02-21 10:40:02 -08:00
Revert "selinux: add a skb_owned_by() hook"
2015-03-20 21:36:53 -04:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
bitmap, cpumask, nodemask: remove dedicated formatting functions
2015-02-13 21:21:39 -08:00
serial: uapi: Declare all userspace-visible io types
2015-03-07 03:39:55 +01:00
vmscan: per memory cgroup slab shrinkers
2015-02-12 18:54:09 -08:00
netfilter: bridge: don't use nf_bridge_info data to store mac header
2015-04-08 16:49:07 +02:00
mm: slub: add kernel address sanitizer support for slub allocator
2015-02-13 21:21:41 -08:00
slab: embed memcg_cache_params to kmem_cache
2015-02-12 18:54:09 -08:00
mm: slub: share object_err function
2015-02-13 21:21:41 -08:00
net: add real socket cookies
2015-03-11 21:55:28 -04:00
net: socket: add support for async operations
2015-03-23 16:41:36 -04:00
mm/util: add kstrdup_const
2015-02-13 21:21:35 -08:00
libstring_helpers.c:string_get_size(): return void
2015-02-12 18:54:13 -08:00
PM / sleep: Re-implement suspend-to-idle handling
2015-02-13 23:49:36 +01:00
mm: remove remaining references to NUMA hinting bits and helpers
2015-02-12 18:54:08 -08:00
tcp: rename struct tcp_request_sock listener
2015-03-17 22:01:56 -04:00
thermal: Introduce dummy functions when thermal is not defined
2015-02-24 14:40:42 -04:00
PM / sleep: Make it possible to quiesce timers during suspend-to-idle
2015-02-15 19:40:09 +01:00
linux/types.h: Always use unsigned long for pgoff_t
2015-02-12 18:54:13 -08:00
netns: constify net_hash_mix() and various callers
2015-03-18 22:00:34 -04:00
new helper: dup_iter()
2015-02-17 22:21:11 -05:00
kasan, module, vmalloc: rework shadow allocation for modules
2015-03-12 18:46:08 -07:00
Merge branch 'for-3.20/drivers' of git://git.kernel.dk/linux-block
2015-02-12 14:30:53 -08:00
workqueue: fix hang involving racing cancel[_delayed]_work_sync()'s for PREEMPT_NONE
2015-03-05 08:04:13 -05:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
mm/zpool: add name argument to create zpool
2015-02-12 18:54:12 -08:00
