Merge branch 'odp_fixes' into hmm.git

From rdma.git

Jason Gunthorpe says:

====================
This is a collection of general cleanups for ODP to clarify some of the
flows around umem creation and use of the interval tree.
====================

The branch is based on v5.3-rc5 due to dependencies, and is being taken
into hmm.git due to dependencies in the next patches.

* odp_fixes:
  RDMA/mlx5: Use odp instead of mr->umem in pagefault_mr
  RDMA/mlx5: Use ib_umem_start instead of umem.address
  RDMA/core: Make invalidate_range a device operation
  RDMA/odp: Use kvcalloc for the dma_list and page_list
  RDMA/odp: Check for overflow when computing the umem_odp end
  RDMA/odp: Provide ib_umem_odp_release() to undo the allocs
  RDMA/odp: Split creating a umem_odp from ib_umem_get
  RDMA/odp: Make the three ways to create a umem_odp clear
  RMDA/odp: Consolidate umem_odp initialization
  RDMA/odp: Make it clearer when a umem is an implicit ODP umem
  RDMA/odp: Iterate over the whole rbtree directly
  RDMA/odp: Use the common interval tree library instead of generic
  RDMA/mlx5: Fix MR npages calculation for IB_ACCESS_HUGETLB

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 614c38ece104..33f41178afcc 100644
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -951,7 +951,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
                                     struct flow_block_offload *f)
 {
         struct flow_block_cb *block_cb;
-        tc_setup_cb_t *cb;
+        flow_setup_cb_t *cb;
 
         if (f->binder_type == FLOW_BLOCK_BINDER_TYPE_CLSACT_INGRESS)
                 cb = dsa_slave_setup_tc_block_cb_ig;
@@ -967,7 +967,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
                 if (flow_block_cb_is_busy(cb, dev, &dsa_slave_block_cb_list))
                         return -EBUSY;
 
-                block_cb = flow_block_cb_alloc(f->net, cb, dev, dev, NULL);
+                block_cb = flow_block_cb_alloc(cb, dev, dev, NULL);
                 if (IS_ERR(block_cb))
                         return PTR_ERR(block_cb);
 
@@ -975,7 +975,7 @@ static int dsa_slave_setup_tc_block(struct net_device *dev,
                 list_add_tail(&block_cb->driver_list, &dsa_slave_block_cb_list);
                 return 0;
         case FLOW_BLOCK_UNBIND:
-                block_cb = flow_block_cb_lookup(f, cb, dev);
+                block_cb = flow_block_cb_lookup(f->block, cb, dev);
                 if (!block_cb)
                         return -ENOENT;