Merge tag 'devprop-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-microblaze.git] / include / rdma / ib_verbs.h

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 0e480a5..356953d 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -1968,6 +1968,9 @@ struct rdma_netdev {
        struct ib_device  *hca;
        u8                 port_num;
 
+       /* cleanup function must be specified */
+       void (*free_rdma_netdev)(struct net_device *netdev);
+
        /* control functions */
        void (*set_id)(struct net_device *netdev, int id);
        /* send packet */
@@ -2243,7 +2246,7 @@ struct ib_device {
                                                           struct ib_udata *udata);
        int                        (*destroy_rwq_ind_table)(struct ib_rwq_ind_table *wq_ind_table);
        /**
-        * rdma netdev operations
+        * rdma netdev operation
         *
         * Driver implementing alloc_rdma_netdev must return -EOPNOTSUPP if it
         * doesn't support the specified rdma netdev type.
@@ -2255,7 +2258,6 @@ struct ib_device {
                                        const char *name,
                                        unsigned char name_assign_type,
                                        void (*setup)(struct net_device *));
-       void (*free_rdma_netdev)(struct net_device *netdev);
 
        struct module               *owner;
        struct device                dev;