David Ahern 385add906b net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents ...

Replace calls to vrf_master_ifindex_rcu and vrf_master_ifindex with either
l3mdev_master_ifindex_rcu or l3mdev_master_ifindex.

The pattern:
    oif = vrf_master_ifindex(dev) ? : dev->ifindex;
is replaced with
    oif = l3mdev_fib_oif(dev);

And remove the now unused vrf macros.

Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2015-09-29 20:40:33 -07:00

..

acpi

ACPI: Eliminate CONFIG_.*{, _MODULE} #ifdef in favor of IS_ENABLED()

2015-09-15 03:05:45 +02:00

asm-generic

Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2015-09-19 19:13:03 -07:00

clocksource

ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource

2015-06-02 09:58:18 +01:00

crypto

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

2015-09-08 12:41:25 -07:00

drm

Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux

2015-09-04 15:49:32 -07:00

dt-bindings

Merge branch 'drivers/reset' into next/late

2015-09-09 15:42:45 -07:00

keys

PKCS#7: Appropriately restrict authenticated attributes and content type

2015-08-12 17:01:01 +01:00

kvm

arm/arm64: KVM: Remove 'config KVM_ARM_MAX_VCPUS'

2015-09-17 13:13:27 +01:00

linux

net: Introduce L3 Master device abstraction

2015-09-29 20:40:32 -07:00

math-emu

…

media

Merge tag 'media/v4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2015-09-11 16:42:39 -07:00

memory

…

misc

cxl: Allow the kernel to trust that an image won't change on PERST.

2015-08-14 21:32:07 +10:00

net

net: Replace vrf_master_ifindex{, _rcu} with l3mdev equivalents

2015-09-29 20:40:33 -07:00

pcmcia

…

ras

tracing: add trace event for memory-failure

2015-06-24 17:49:43 -07:00

rdma

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma

2015-09-19 20:04:11 -07:00

rxrpc

RxRPC: Handle VERSION Rx protocol packets

2015-04-01 16:31:26 +01:00

scsi

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-09-11 19:00:42 -07:00

soc

Merge tag 'iommu-updates-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2015-09-08 17:22:35 -07:00

sound

ALSA: hda - Fix missing inline for dummy snd_hdac_set_codec_wakeup()

2015-09-02 12:24:55 +02:00

target

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending

2015-09-11 19:00:42 -07:00

trace

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux

2015-09-11 16:13:47 -07:00

uapi

bridge: vlan: add per-vlan struct and move to rhashtables

2015-09-29 13:36:06 -07:00

video

Merge tag 'libnvdimm-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

2015-09-08 14:35:59 -07:00

xen

Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2015-09-10 16:21:11 -07:00

Kbuild

…