export RK_PA3

hc

2024-02-19 151fecfb72a0d602dfe79790602ef64b4e241574

 kernel/drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c
..
..
@@ -95,8 +95,7 @@
95
95
 }
96
96
 
97
97
 static u16 opa_vnic_select_queue(struct net_device *netdev, struct sk_buff *skb,
98
-				 struct net_device *sb_dev,
99
-				 select_queue_fallback_t fallback)
98
+				 struct net_device *sb_dev)
100
99
 {
101
100
 	struct opa_vnic_adapter *adapter = opa_vnic_priv(netdev);
102
101
 	struct opa_vnic_skb_mdata *mdata;
..
..
@@ -106,8 +105,7 @@
106
105
 	mdata = skb_push(skb, sizeof(*mdata));
107
106
 	mdata->entropy = opa_vnic_calc_entropy(skb);
108
107
 	mdata->vl = opa_vnic_get_vl(adapter, skb);
109
-	rc = adapter->rn_ops->ndo_select_queue(netdev, skb,
110
-					       sb_dev, fallback);
108
+	rc = adapter->rn_ops->ndo_select_queue(netdev, skb, sb_dev);
111
109
 	skb_pull(skb, sizeof(*mdata));
112
110
 	return rc;
113
111
 }
..
..
@@ -330,10 +328,10 @@
330
328
 	struct rdma_netdev *rn;
331
329
 	int rc;
332
330
 
333
-	netdev = ibdev->alloc_rdma_netdev(ibdev, port_num,
334
-					  RDMA_NETDEV_OPA_VNIC,
335
-					  "veth%d", NET_NAME_UNKNOWN,
336
-					  ether_setup);
331
+	netdev = ibdev->ops.alloc_rdma_netdev(ibdev, port_num,
332
+					      RDMA_NETDEV_OPA_VNIC,
333
+					      "veth%d", NET_NAME_UNKNOWN,
334
+					      ether_setup);
337
335
 	if (!netdev)
338
336
 		return ERR_PTR(-ENOMEM);
339
337
 	else if (IS_ERR(netdev))