diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/openvswitch/vport-internal_dev.h | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
Diffstat (limited to 'net/openvswitch/vport-internal_dev.h')
| -rw-r--r-- | net/openvswitch/vport-internal_dev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/openvswitch/vport-internal_dev.h b/net/openvswitch/vport-internal_dev.h index 9a7d30ecc6a2..1b179a190cff 100644 --- a/net/openvswitch/vport-internal_dev.h +++ b/net/openvswitch/vport-internal_dev.h | |||
| @@ -24,5 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | int ovs_is_internal_dev(const struct net_device *); | 25 | int ovs_is_internal_dev(const struct net_device *); |
| 26 | struct vport *ovs_internal_dev_get_vport(struct net_device *); | 26 | struct vport *ovs_internal_dev_get_vport(struct net_device *); |
| 27 | int ovs_internal_dev_rtnl_link_register(void); | ||
| 28 | void ovs_internal_dev_rtnl_link_unregister(void); | ||
| 27 | 29 | ||
| 28 | #endif /* vport-internal_dev.h */ | 30 | #endif /* vport-internal_dev.h */ |