Tom Herbert b6a0e72ad3 net: Fix typo in netdev_intersect_features ...

Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.

Fixes: c8cd0989bd ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2016-01-11 23:28:44 -05:00

..

acpi

Merge branch 'acpi-pci'

2015-11-07 01:30:10 +01:00

asm-generic

treewide: Remove old email address

2015-11-23 09:44:58 +01:00

clocksource

…

crypto

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2015-11-05 15:32:38 -08:00

drm

drm/nouveau: Fix pre-nv50 pageflip events (v4)

2015-12-04 13:49:38 +10:00

dt-bindings

Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:06:26 -08:00

keys

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

kvm

KVM: arm/arm64: arch_timer: Preserve physical dist. active state on LR.active

2015-11-24 18:07:40 +01:00

linux

net: Fix typo in netdev_intersect_features

2016-01-11 23:28:44 -05:00

math-emu

…

media

[media] v4l2: add support for SDR transmitter

2015-10-20 15:40:50 -02:00

memory

…

misc

…

net

net, sched: add skb_at_tc_ingress helper

2016-01-10 17:54:28 -05:00

pcmcia

…

ras

…

rdma

IB/mad: Require CM send method for everything except ClassPortInfo

2015-12-08 12:19:11 -05:00

rxrpc

…

scsi

Merge branch 'mkp-fixes' into fixes

2015-12-03 09:32:33 -08:00

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

sound

ALSA: hda - Fix playback noise with 24/32 bit sample size on BXT

2015-12-07 09:04:44 +01:00

target

target: Fix race for SCF_COMPARE_AND_WRITE_POST checking

2015-11-28 19:33:15 -08:00

trace

net: IPv6 fib lookup tracepoint

2015-11-22 11:54:10 -05:00

uapi

bpf: support ipv6 for bpf_skb_{set,get}_tunnel_key

2016-01-11 17:32:55 -05:00

video

gpu: ipu-v3: drop unused dmfc field from client platform data

2015-11-24 11:30:15 +01:00

xen

xen: Add RING_COPY_REQUEST()

2015-12-18 10:00:17 -05:00

Kbuild

…