Jiri Benc 125372faa4 gre: receive also TEB packets for lwtunnels ... For ipgre interfaces in collect metadata mode, receive also traffic with encapsulated Ethernet headers. The lwtunnel users are supposed to sort this out correctly. This allows to have mixed Ethernet + L3-only traffic on the same lwtunnel interface. This is the same way as VXLAN-GPE behaves. To keep backwards compatibility and prevent any surprises, gretap interfaces have priority in receiving packets with Ethernet headers. Signed-off-by: Jiri Benc <jbenc@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2016-05-04 14:11:32 -04:00
..
acpi	Merge branches 'acpi-processor' and 'acpi-cppc'	2016-03-14 14:20:33 +01:00
asm-generic	asm-generic/futex: Re-enable preemption in futex_atomic_cmpxchg_inatomic()	2016-04-21 11:06:09 +02:00
clocksource
crypto	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2016-03-17 11:33:45 -07:00
drm	drm: Loongson-3 doesn't fully support wc memory	2016-04-22 10:24:11 +10:00
dt-bindings	The clk changes for this release cycle are mostly dominated by	2016-03-23 06:06:45 -07:00
keys
kvm	arm64: KVM: vgic-v3: Avoid accessing ICH registers	2016-03-09 04:24:04 +00:00
linux	net/mlx5: Flow steering, Add vport ACL support	2016-05-04 14:04:46 -04:00
math-emu
media	[media] media: vb2: Fix regression on poll() for RW mode	2016-04-25 10:21:23 -03:00
memory
misc	cxl: Remove cxl_get_phys_dev() kernel API	2016-03-09 23:40:02 +11:00
net	gre: receive also TEB packets for lwtunnels	2016-05-04 14:11:32 -04:00
pcmcia
ras
rdma	IB/security: Restrict use of the write() interface	2016-04-28 12:03:16 -04:00
rxrpc	rxrpc: Static arrays of strings should be const char *const[]	2016-04-11 15:34:40 -04:00
scsi	Merge branch 'fixes-base' into fixes	2016-04-05 06:56:47 -04:00
soc	IOMMU Updates for Linux v4.6	2016-03-22 11:57:43 -07:00
sound	ALSA: hda - Update BCLK also at hotplug for i915 HSW/BDW	2016-04-26 10:11:11 +02:00
target	target: add a new add_wwn_groups fabrics method	2016-03-30 20:06:44 -07:00
trace	perf, bpf: minimize the size of perf_trace_() tracepoint handler	2016-04-21 13:48:20 -04:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-04 00:52:29 -04:00
video	gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot	2016-03-31 11:24:33 +02:00
xen	xen-netback: re-import canonical netif header	2016-03-13 22:08:01 -04:00
Kbuild