diff options
author | 2016-11-01 09:17:57 +0000 | |
---|---|---|
committer | 2016-11-01 09:17:57 +0000 | |
commit | 9902aa4728fe9128ea45f1a772e2238d64d8cdc5 (patch) | |
tree | cca30efb3ad2126fcb10aa6349ed799a5656e851 /net/switchdev/switchdev.c | |
parent | ARM: dts: am335x-boneblack: Add HDMI audio support (diff) | |
parent | drm/i2c: tda998x: mali-dp: hdlcd: refactor connector registration (diff) | |
download | wireguard-linux-9902aa4728fe9128ea45f1a772e2238d64d8cdc5.tar.xz wireguard-linux-9902aa4728fe9128ea45f1a772e2238d64d8cdc5.zip |
Merge branch 'drm-tda998x-mali' into drm-tda998x-devel
Diffstat (limited to '')
-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) |