diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-06 17:31:06 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-01-06 17:31:06 -0800 |
| commit | efbc57c0e6a92083fce03927736f5d389182935b (patch) | |
| tree | 2e900ae80abfd296a6f0c0c3a7e6c1ae95ae2705 /net/openvswitch/vport.h | |
| parent | 4b1af853646ca893fa686701d1605998fffcc82c (diff) | |
| parent | 57c80e8e5d1cddae0651e5314394e6069ebbbe3c (diff) | |
| download | linux-efbc57c0e6a92083fce03927736f5d389182935b.tar.gz linux-efbc57c0e6a92083fce03927736f5d389182935b.tar.bz2 linux-efbc57c0e6a92083fce03927736f5d389182935b.zip | |
Merge branch 'goodix' into next
Merge several improvements to Goodix touchscreen driver:
- power management support
- configuration upload
- axis swapping and inversion
Diffstat (limited to 'net/openvswitch/vport.h')
| -rw-r--r-- | net/openvswitch/vport.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net/openvswitch/vport.h b/net/openvswitch/vport.h index bdfd82a7c064..8ea3a96980ac 100644 --- a/net/openvswitch/vport.h +++ b/net/openvswitch/vport.h @@ -196,7 +196,13 @@ static inline const char *ovs_vport_name(struct vport *vport) return vport->dev->name; } -int ovs_vport_ops_register(struct vport_ops *ops); +int __ovs_vport_ops_register(struct vport_ops *ops); +#define ovs_vport_ops_register(ops) \ + ({ \ + (ops)->owner = THIS_MODULE; \ + __ovs_vport_ops_register(ops); \ + }) + void ovs_vport_ops_unregister(struct vport_ops *ops); static inline struct rtable *ovs_tunnel_route_lookup(struct net *net, |