Skip to content

Commit 6a0dde8

Browse files
fsl-latifdledford
authored andcommitted
iw_nes: remove port mapper related code
Now that most of the port mapper code been moved to iwcm, we can remove it from port mapper service user drivers. Signed-off-by: Mustafa Ismail <[email protected]> Signed-off-by: Tatyana E. Nikolova <[email protected]> Signed-off-by: Faisal Latif <[email protected]> Signed-off-by: Doug Ledford <[email protected]>
1 parent b493d91 commit 6a0dde8

File tree

4 files changed

+80
-309
lines changed

4 files changed

+80
-309
lines changed

drivers/infiniband/hw/nes/nes.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,6 @@ static struct pci_device_id nes_pci_table[] = {
111111

112112
MODULE_DEVICE_TABLE(pci, nes_pci_table);
113113

114-
/* registered nes netlink callbacks */
115-
static struct ibnl_client_cbs nes_nl_cb_table[] = {
116-
[RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb},
117-
[RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},
118-
[RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},
119-
[RDMA_NL_IWPM_REMOTE_INFO] = {.dump = iwpm_remote_info_cb},
120-
[RDMA_NL_IWPM_HANDLE_ERR] = {.dump = iwpm_mapping_error_cb},
121-
[RDMA_NL_IWPM_MAPINFO] = {.dump = iwpm_mapping_info_cb},
122-
[RDMA_NL_IWPM_MAPINFO_NUM] = {.dump = iwpm_ack_mapping_info_cb}
123-
};
124-
125114
static int nes_inetaddr_event(struct notifier_block *, unsigned long, void *);
126115
static int nes_net_event(struct notifier_block *, unsigned long, void *);
127116
static int nes_notifiers_registered;
@@ -682,17 +671,6 @@ static int nes_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
682671
}
683672
nes_notifiers_registered++;
684673

685-
if (ibnl_add_client(RDMA_NL_NES, RDMA_NL_IWPM_NUM_OPS, nes_nl_cb_table))
686-
printk(KERN_ERR PFX "%s[%u]: Failed to add netlink callback\n",
687-
__func__, __LINE__);
688-
689-
ret = iwpm_init(RDMA_NL_NES);
690-
if (ret) {
691-
printk(KERN_ERR PFX "%s: port mapper initialization failed\n",
692-
pci_name(pcidev));
693-
goto bail7;
694-
}
695-
696674
INIT_DELAYED_WORK(&nesdev->work, nes_recheck_link_status);
697675

698676
/* Initialize network devices */
@@ -731,7 +709,6 @@ static int nes_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)
731709

732710
nes_debug(NES_DBG_INIT, "netdev_count=%d, nesadapter->netdev_count=%d\n",
733711
nesdev->netdev_count, nesdev->nesadapter->netdev_count);
734-
ibnl_remove_client(RDMA_NL_NES);
735712

736713
nes_notifiers_registered--;
737714
if (nes_notifiers_registered == 0) {
@@ -795,8 +772,6 @@ static void nes_remove(struct pci_dev *pcidev)
795772
nesdev->nesadapter->netdev_count--;
796773
}
797774
}
798-
ibnl_remove_client(RDMA_NL_NES);
799-
iwpm_exit(RDMA_NL_NES);
800775

801776
nes_notifiers_registered--;
802777
if (nes_notifiers_registered == 0) {

0 commit comments

Comments
 (0)