iw_nes: remove port mapper related code (6a0dde89) · Commits · 戴 / test

drivers/infiniband/hw/nes/nes.c

+0 −25

Original line number	Diff line number	Diff line
		@@ -111,17 +111,6 @@ static struct pci_device_id nes_pci_table[] = {

		MODULE_DEVICE_TABLE(pci, nes_pci_table);

		/* registered nes netlink callbacks */
		static struct ibnl_client_cbs nes_nl_cb_table[] = {
		[RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb},
		[RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},
		[RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},
		[RDMA_NL_IWPM_REMOTE_INFO] = {.dump = iwpm_remote_info_cb},
		[RDMA_NL_IWPM_HANDLE_ERR] = {.dump = iwpm_mapping_error_cb},
		[RDMA_NL_IWPM_MAPINFO] = {.dump = iwpm_mapping_info_cb},
		[RDMA_NL_IWPM_MAPINFO_NUM] = {.dump = iwpm_ack_mapping_info_cb}
		};

		static int nes_inetaddr_event(struct notifier_block , unsigned long, void );
		static int nes_net_event(struct notifier_block , unsigned long, void );
		static int nes_notifiers_registered;
		@@ -682,17 +671,6 @@ static int nes_probe(struct pci_dev pcidev, const struct pci_device_id ent)
		}
		nes_notifiers_registered++;

		if (ibnl_add_client(RDMA_NL_NES, RDMA_NL_IWPM_NUM_OPS, nes_nl_cb_table))
		printk(KERN_ERR PFX "%s[%u]: Failed to add netlink callback\n",
		__func__, __LINE__);

		ret = iwpm_init(RDMA_NL_NES);
		if (ret) {
		printk(KERN_ERR PFX "%s: port mapper initialization failed\n",
		pci_name(pcidev));
		goto bail7;
		}

		INIT_DELAYED_WORK(&nesdev->work, nes_recheck_link_status);

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

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

		nes_notifiers_registered--;
		if (nes_notifiers_registered == 0) {
		@@ -795,8 +772,6 @@ static void nes_remove(struct pci_dev *pcidev)
		nesdev->nesadapter->netdev_count--;
		}
		}
		ibnl_remove_client(RDMA_NL_NES);
		iwpm_exit(RDMA_NL_NES);

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

drivers/infiniband/hw/nes/nes_cm.c

+76 −275

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/nes/nes_cm.h

+2 −9

Original line number	Diff line number	Diff line
		@@ -293,8 +293,8 @@ struct nes_cm_listener {
		struct list_head list;
		struct nes_cm_core *cm_core;
		u8 loc_mac[ETH_ALEN];
		nes_addr_t loc_addr, mapped_loc_addr;
		u16 loc_port, mapped_loc_port;
		nes_addr_t loc_addr;
		u16 loc_port;
		struct iw_cm_id *cm_id;
		enum nes_cm_conn_type conn_type;
		atomic_t ref_count;
		@@ -309,9 +309,7 @@ struct nes_cm_listener {
		/* per connection node and node state information */
		struct nes_cm_node {
		nes_addr_t loc_addr, rem_addr;
		nes_addr_t mapped_loc_addr, mapped_rem_addr;
		u16 loc_port, rem_port;
		u16 mapped_loc_port, mapped_rem_port;

		u8 loc_mac[ETH_ALEN];
		u8 rem_mac[ETH_ALEN];
		@@ -368,11 +366,6 @@ struct nes_cm_info {
		u16 rem_port;
		nes_addr_t loc_addr;
		nes_addr_t rem_addr;
		u16 mapped_loc_port;
		u16 mapped_rem_port;
		nes_addr_t mapped_loc_addr;
		nes_addr_t mapped_rem_addr;

		enum nes_cm_conn_type conn_type;
		int backlog;
		};

drivers/infiniband/hw/nes/nes_verbs.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -3768,6 +3768,8 @@ struct nes_ib_device nes_init_ofa_device(struct net_device netdev)
		nesibdev->ibdev.iwcm->create_listen = nes_create_listen;
		nesibdev->ibdev.iwcm->destroy_listen = nes_destroy_listen;
		nesibdev->ibdev.get_port_immutable = nes_port_immutable;
		memcpy(nesibdev->ibdev.iwcm->ifname, netdev->name,
		sizeof(nesibdev->ibdev.iwcm->ifname));

		return nesibdev;
		}

Admin message