xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scsi: be2iscsi: Rename iface get/set/create/destroy APIs

Browse Source 
Rename mgmt_get_if_info to be consistent with APIs name.
Rename create/destroy APIs to indicate IFACE operations.
Remove legacy be2iscsi and use beiscsi.

Signed-off-by: Jitendra Bhivare <jitendra.bhivare@broadcom.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Jitendra Bhivare
2016-08-19 15:20:06 +05:30
committed by Martin K. Petersen
parent c5bf88897a
commit 96b48b9292
5 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/scsi/be2iscsi/be_iscsi.c
View File

@@ -237,7 +237,7 @@ int beiscsi_conn_bind(struct iscsi_cls_session *cls_session,
return beiscsi_bindconn_cid(phba, beiscsi_conn, beiscsi_ep->ep_cid); return beiscsi_bindconn_cid(phba, beiscsi_conn, beiscsi_ep->ep_cid);
} }
static int beiscsi_create_ipv4_iface(struct beiscsi_hba *phba) static int beiscsi_iface_create_ipv4(struct beiscsi_hba *phba)
{ {
if (phba->ipv4_iface) if (phba->ipv4_iface)
return 0; return 0;
@@ -256,7 +256,7 @@ static int beiscsi_create_ipv4_iface(struct beiscsi_hba *phba)
return 0; return 0;
} }
static int beiscsi_create_ipv6_iface(struct beiscsi_hba *phba) static int beiscsi_iface_create_ipv6(struct beiscsi_hba *phba)
{ {
if (phba->ipv6_iface) if (phba->ipv6_iface)
return 0; return 0;
@@ -275,22 +275,22 @@ static int beiscsi_create_ipv6_iface(struct beiscsi_hba *phba)
return 0; return 0;
} }
void beiscsi_create_def_ifaces(struct beiscsi_hba *phba) void beiscsi_iface_create_default(struct beiscsi_hba *phba)
{ {
struct be_cmd_get_if_info_resp *if_info; struct be_cmd_get_if_info_resp *if_info;
if (!mgmt_get_if_info(phba, BE2_IPV4, &if_info)) { if (!beiscsi_if_get_info(phba, BE2_IPV4, &if_info)) {
beiscsi_create_ipv4_iface(phba); beiscsi_iface_create_ipv4(phba);
kfree(if_info); kfree(if_info);
} }
if (!mgmt_get_if_info(phba, BE2_IPV6, &if_info)) { if (!beiscsi_if_get_info(phba, BE2_IPV6, &if_info)) {
beiscsi_create_ipv6_iface(phba); beiscsi_iface_create_ipv6(phba);
kfree(if_info); kfree(if_info);
} }
} }
void beiscsi_destroy_def_ifaces(struct beiscsi_hba *phba) void beiscsi_iface_destroy_default(struct beiscsi_hba *phba)
{ {
if (phba->ipv6_iface) { if (phba->ipv6_iface) {
iscsi_destroy_iface(phba->ipv6_iface); iscsi_destroy_iface(phba->ipv6_iface);
@@ -350,7 +350,7 @@ beiscsi_iface_config_ipv4(struct Scsi_Host *shost,
switch (info->param) { switch (info->param) {
case ISCSI_NET_PARAM_IFACE_ENABLE: case ISCSI_NET_PARAM_IFACE_ENABLE:
if (info->value[0] == ISCSI_IFACE_ENABLE) if (info->value[0] == ISCSI_IFACE_ENABLE)
ret = beiscsi_create_ipv4_iface(phba); ret = beiscsi_iface_create_ipv4(phba);
else { else {
iscsi_destroy_iface(phba->ipv4_iface); iscsi_destroy_iface(phba->ipv4_iface);
phba->ipv4_iface = NULL; phba->ipv4_iface = NULL;
@@ -409,7 +409,7 @@ beiscsi_iface_config_ipv6(struct Scsi_Host *shost,
switch (iface_param->param) { switch (iface_param->param) {
case ISCSI_NET_PARAM_IFACE_ENABLE: case ISCSI_NET_PARAM_IFACE_ENABLE:
if (iface_param->value[0] == ISCSI_IFACE_ENABLE) if (iface_param->value[0] == ISCSI_IFACE_ENABLE)
ret = beiscsi_create_ipv6_iface(phba); ret = beiscsi_iface_create_ipv6(phba);
else { else {
iscsi_destroy_iface(phba->ipv6_iface); iscsi_destroy_iface(phba->ipv6_iface);
phba->ipv6_iface = NULL; phba->ipv6_iface = NULL;
@@ -424,8 +424,8 @@ beiscsi_iface_config_ipv6(struct Scsi_Host *shost,
return ret; return ret;
} }
int be2iscsi_iface_set_param(struct Scsi_Host *shost, int beiscsi_iface_set_param(struct Scsi_Host *shost,
void *data, uint32_t dt_len) void *data, uint32_t dt_len)
{ {
struct iscsi_iface_param_info *iface_param = NULL; struct iscsi_iface_param_info *iface_param = NULL;
struct beiscsi_hba *phba = iscsi_host_priv(shost); struct beiscsi_hba *phba = iscsi_host_priv(shost);
@@ -506,9 +506,9 @@ int be2iscsi_iface_set_param(struct Scsi_Host *shost,
return ret; return ret;
} }
static int be2iscsi_get_if_param(struct beiscsi_hba *phba, static int __beiscsi_iface_get_param(struct beiscsi_hba *phba,
struct iscsi_iface *iface, int param, struct iscsi_iface *iface,
char *buf) int param, char *buf)
{ {
struct be_cmd_get_if_info_resp *if_info; struct be_cmd_get_if_info_resp *if_info;
int len, ip_type = BE2_IPV4; int len, ip_type = BE2_IPV4;
@@ -516,7 +516,7 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6) if (iface->iface_type == ISCSI_IFACE_TYPE_IPV6)
ip_type = BE2_IPV6; ip_type = BE2_IPV6;
len = mgmt_get_if_info(phba, ip_type, &if_info); len = beiscsi_if_get_info(phba, ip_type, &if_info);
if (len) if (len)
return len; return len;
@@ -565,9 +565,9 @@ static int be2iscsi_get_if_param(struct beiscsi_hba *phba,
return len; return len;
} }
int be2iscsi_iface_get_param(struct iscsi_iface *iface, int beiscsi_iface_get_param(struct iscsi_iface *iface,
enum iscsi_param_type param_type, enum iscsi_param_type param_type,
int param, char *buf) int param, char *buf)
{ {
struct Scsi_Host *shost = iscsi_iface_to_shost(iface); struct Scsi_Host *shost = iscsi_iface_to_shost(iface);
struct beiscsi_hba *phba = iscsi_host_priv(shost); struct beiscsi_hba *phba = iscsi_host_priv(shost);
@@ -588,7 +588,7 @@ int be2iscsi_iface_get_param(struct iscsi_iface *iface,
case ISCSI_NET_PARAM_VLAN_ENABLED: case ISCSI_NET_PARAM_VLAN_ENABLED:
case ISCSI_NET_PARAM_VLAN_ID: case ISCSI_NET_PARAM_VLAN_ID:
case ISCSI_NET_PARAM_VLAN_PRIORITY: case ISCSI_NET_PARAM_VLAN_PRIORITY:
len = be2iscsi_get_if_param(phba, iface, param, buf); len = __beiscsi_iface_get_param(phba, iface, param, buf);
break; break;
case ISCSI_NET_PARAM_IFACE_ENABLE: case ISCSI_NET_PARAM_IFACE_ENABLE:
if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4) if (iface->iface_type == ISCSI_IFACE_TYPE_IPV4)
@@ -1360,7 +1360,7 @@ free_ep:
iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep); iscsi_destroy_endpoint(beiscsi_ep->openiscsi_ep);
} }
umode_t be2iscsi_attr_is_visible(int param_type, int param) umode_t beiscsi_attr_is_visible(int param_type, int param)
{ {
switch (param_type) { switch (param_type) {
case ISCSI_NET_PARAM: case ISCSI_NET_PARAM:

10
drivers/scsi/be2iscsi/be_iscsi.h
View File

@@ -30,18 +30,18 @@
#define NON_BLOCKING 0x0 #define NON_BLOCKING 0x0
#define BLOCKING 0x1 #define BLOCKING 0x1
void beiscsi_create_def_ifaces(struct beiscsi_hba *phba); void beiscsi_iface_create_default(struct beiscsi_hba *phba);
void beiscsi_destroy_def_ifaces(struct beiscsi_hba *phba); void beiscsi_iface_destroy_default(struct beiscsi_hba *phba);
int be2iscsi_iface_get_param(struct iscsi_iface *iface, int beiscsi_iface_get_param(struct iscsi_iface *iface,
enum iscsi_param_type param_type, enum iscsi_param_type param_type,
int param, char *buf); int param, char *buf);
int be2iscsi_iface_set_param(struct Scsi_Host *shost, int beiscsi_iface_set_param(struct Scsi_Host *shost,
void *data, uint32_t count); void *data, uint32_t count);
umode_t be2iscsi_attr_is_visible(int param_type, int param); umode_t beiscsi_attr_is_visible(int param_type, int param);
void beiscsi_offload_connection(struct beiscsi_conn *beiscsi_conn, void beiscsi_offload_connection(struct beiscsi_conn *beiscsi_conn,
struct beiscsi_offload_params *params); struct beiscsi_offload_params *params);

10
drivers/scsi/be2iscsi/be_main.c
View File

@@ -5327,7 +5327,7 @@ static void beiscsi_remove(struct pci_dev *pcidev)
return; return;
} }
beiscsi_destroy_def_ifaces(phba); beiscsi_iface_destroy_default(phba);
iscsi_boot_destroy_kset(phba->boot_kset); iscsi_boot_destroy_kset(phba->boot_kset);
iscsi_host_remove(phba->shost); iscsi_host_remove(phba->shost);
beiscsi_quiesce(phba, BEISCSI_CLEAN_UNLOAD); beiscsi_quiesce(phba, BEISCSI_CLEAN_UNLOAD);
@@ -5777,7 +5777,7 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev,
"BM_%d : Could not set up " "BM_%d : Could not set up "
"iSCSI boot info.\n"); "iSCSI boot info.\n");
beiscsi_create_def_ifaces(phba); beiscsi_iface_create_default(phba);
schedule_delayed_work(&phba->beiscsi_hw_check_task, schedule_delayed_work(&phba->beiscsi_hw_check_task,
msecs_to_jiffies(1000)); msecs_to_jiffies(1000));
@@ -5828,9 +5828,9 @@ struct iscsi_transport beiscsi_iscsi_transport = {
.create_conn = beiscsi_conn_create, .create_conn = beiscsi_conn_create,
.bind_conn = beiscsi_conn_bind, .bind_conn = beiscsi_conn_bind,
.destroy_conn = iscsi_conn_teardown, .destroy_conn = iscsi_conn_teardown,
.attr_is_visible = be2iscsi_attr_is_visible, .attr_is_visible = beiscsi_attr_is_visible,
.set_iface_param = be2iscsi_iface_set_param, .set_iface_param = beiscsi_iface_set_param,
.get_iface_param = be2iscsi_iface_get_param, .get_iface_param = beiscsi_iface_get_param,
.set_param = beiscsi_set_param, .set_param = beiscsi_set_param,
.get_conn_param = iscsi_conn_get_param, .get_conn_param = iscsi_conn_get_param,
.get_session_param = iscsi_session_get_param, .get_session_param = iscsi_session_get_param,

8
drivers/scsi/be2iscsi/be_mgmt.c
View File

@@ -1167,7 +1167,7 @@ int beiscsi_if_en_static(struct beiscsi_hba *phba, u32 ip_type,
struct be_dma_mem nonemb_cmd; struct be_dma_mem nonemb_cmd;
int rc; int rc;
rc = mgmt_get_if_info(phba, ip_type, &if_info); rc = beiscsi_if_get_info(phba, ip_type, &if_info);
if (rc) if (rc)
return rc; return rc;
@@ -1212,7 +1212,7 @@ int beiscsi_if_en_dhcp(struct beiscsi_hba *phba, u32 ip_type)
u8 *gw; u8 *gw;
int rc; int rc;
rc = mgmt_get_if_info(phba, ip_type, &if_info); rc = beiscsi_if_get_info(phba, ip_type, &if_info);
if (rc) if (rc)
return rc; return rc;
@@ -1299,8 +1299,8 @@ int beiscsi_if_set_vlan(struct beiscsi_hba *phba, uint16_t vlan_tag)
} }
int mgmt_get_if_info(struct beiscsi_hba *phba, int ip_type, int beiscsi_if_get_info(struct beiscsi_hba *phba, int ip_type,
struct be_cmd_get_if_info_resp **if_info) struct be_cmd_get_if_info_resp **if_info)
{ {
struct be_cmd_get_if_info_req *req; struct be_cmd_get_if_info_req *req;
struct be_dma_mem nonemb_cmd; struct be_dma_mem nonemb_cmd;

4
drivers/scsi/be2iscsi/be_mgmt.h
View File

@@ -295,8 +295,8 @@ unsigned int mgmt_get_session_info(struct beiscsi_hba *phba,
int mgmt_get_nic_conf(struct beiscsi_hba *phba, int mgmt_get_nic_conf(struct beiscsi_hba *phba,
struct be_cmd_get_nic_conf_resp *mac); struct be_cmd_get_nic_conf_resp *mac);
int mgmt_get_if_info(struct beiscsi_hba *phba, int ip_type, int beiscsi_if_get_info(struct beiscsi_hba *phba, int ip_type,
struct be_cmd_get_if_info_resp **if_info); struct be_cmd_get_if_info_resp **if_info);
int beiscsi_if_get_gw(struct beiscsi_hba *phba, u32 ip_type, int beiscsi_if_get_gw(struct beiscsi_hba *phba, u32 ip_type,
struct be_cmd_get_def_gateway_resp *resp); struct be_cmd_get_def_gateway_resp *resp);