diff options
author | 2016-09-14 20:53:26 +0200 | |
---|---|---|
committer | 2016-09-14 20:53:26 +0200 | |
commit | 16217dc79dbc599b110dda26d0421df47904bba4 (patch) | |
tree | 98df3c18b14284b8a6f8b04de12e0b7dde5a55fa /net/switchdev/switchdev.c | |
parent | genirq: Expose interrupt information through sysfs (diff) | |
parent | irqchip/gicv3-its: Use MADT ITS subtable to do PCI/MSI domain initialization (diff) | |
download | linux-dev-16217dc79dbc599b110dda26d0421df47904bba4.tar.xz linux-dev-16217dc79dbc599b110dda26d0421df47904bba4.zip |
Merge tag 'irqchip-4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Merge the first drop of irqchip updates for 4.9 from Marc Zyngier:
- ACPI IORT core code
- IORT support for the GICv3 ITS
- A few of GIC cleanups
Diffstat (limited to 'net/switchdev/switchdev.c')
-rw-r--r-- | net/switchdev/switchdev.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/switchdev/switchdev.c b/net/switchdev/switchdev.c index 59658b2e9cdf..a5fc9dd24aa9 100644 --- a/net/switchdev/switchdev.c +++ b/net/switchdev/switchdev.c @@ -1286,8 +1286,8 @@ void switchdev_fib_ipv4_abort(struct fib_info *fi) } EXPORT_SYMBOL_GPL(switchdev_fib_ipv4_abort); -static bool switchdev_port_same_parent_id(struct net_device *a, - struct net_device *b) +bool switchdev_port_same_parent_id(struct net_device *a, + struct net_device *b) { struct switchdev_attr a_attr = { .orig_dev = a, @@ -1323,6 +1323,7 @@ static u32 switchdev_port_fwd_mark_get(struct net_device *dev, return dev->ifindex; } +EXPORT_SYMBOL_GPL(switchdev_port_same_parent_id); static void switchdev_port_fwd_mark_reset(struct net_device *group_dev, u32 old_mark, u32 *reset_mark) |