diff options
author | Bhanu Prakash Gollapudi <bprakash@broadcom.com> | 2011-08-04 20:38:40 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-08-27 10:35:31 -0400 |
commit | 776cebcac6fad2f638c0ab16e2111a84c1c85d84 (patch) | |
tree | 5ffa2a926c52503e93fc0c7bf9dd66e1d472aa84 | |
parent | cdf54668bc48193e43adc8f75ce419ce0ce50fc0 (diff) |
[SCSI] bnx2fc: Change function names of bnx2fc_netdev_setup/bnx2fc_netdev_cleanup
Change them to bnx2fc_interface_setup/bnx2fc_interface_cleanup in preperation
for the patches to follow. Interface specific cleanup functionality will be
moved to bnx2fc_interface_cleanup.
Signed-off-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
-rw-r--r-- | drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c index 21792e7eaeb2..407a9b841d4a 100644 --- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c +++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c | |||
@@ -1064,7 +1064,7 @@ static int bnx2fc_vport_disable(struct fc_vport *vport, bool disable) | |||
1064 | } | 1064 | } |
1065 | 1065 | ||
1066 | 1066 | ||
1067 | static int bnx2fc_netdev_setup(struct bnx2fc_interface *interface) | 1067 | static int bnx2fc_interface_setup(struct bnx2fc_interface *interface) |
1068 | { | 1068 | { |
1069 | struct net_device *netdev = interface->netdev; | 1069 | struct net_device *netdev = interface->netdev; |
1070 | struct net_device *physdev = interface->hba->phys_dev; | 1070 | struct net_device *physdev = interface->hba->phys_dev; |
@@ -1262,7 +1262,7 @@ struct bnx2fc_interface *bnx2fc_interface_create(struct bnx2fc_hba *hba, | |||
1262 | interface->ctlr.get_src_addr = bnx2fc_get_src_mac; | 1262 | interface->ctlr.get_src_addr = bnx2fc_get_src_mac; |
1263 | set_bit(BNX2FC_CTLR_INIT_DONE, &interface->if_flags); | 1263 | set_bit(BNX2FC_CTLR_INIT_DONE, &interface->if_flags); |
1264 | 1264 | ||
1265 | rc = bnx2fc_netdev_setup(interface); | 1265 | rc = bnx2fc_interface_setup(interface); |
1266 | if (!rc) | 1266 | if (!rc) |
1267 | return interface; | 1267 | return interface; |
1268 | 1268 | ||
@@ -1382,7 +1382,7 @@ free_blport: | |||
1382 | return NULL; | 1382 | return NULL; |
1383 | } | 1383 | } |
1384 | 1384 | ||
1385 | static void bnx2fc_netdev_cleanup(struct bnx2fc_interface *interface) | 1385 | static void bnx2fc_interface_cleanup(struct bnx2fc_interface *interface) |
1386 | { | 1386 | { |
1387 | /* Dont listen for Ethernet packets anymore */ | 1387 | /* Dont listen for Ethernet packets anymore */ |
1388 | __dev_remove_pack(&interface->fcoe_packet_type); | 1388 | __dev_remove_pack(&interface->fcoe_packet_type); |
@@ -1459,7 +1459,7 @@ static int bnx2fc_destroy(struct net_device *netdev) | |||
1459 | 1459 | ||
1460 | hba = interface->hba; | 1460 | hba = interface->hba; |
1461 | 1461 | ||
1462 | bnx2fc_netdev_cleanup(interface); | 1462 | bnx2fc_interface_cleanup(interface); |
1463 | lport = interface->ctlr.lp; | 1463 | lport = interface->ctlr.lp; |
1464 | bnx2fc_stop(interface); | 1464 | bnx2fc_stop(interface); |
1465 | list_del(&interface->list); | 1465 | list_del(&interface->list); |
@@ -1938,7 +1938,7 @@ static int bnx2fc_create(struct net_device *netdev, enum fip_state fip_mode) | |||
1938 | if (!lport) { | 1938 | if (!lport) { |
1939 | printk(KERN_ERR PFX "Failed to create interface (%s)\n", | 1939 | printk(KERN_ERR PFX "Failed to create interface (%s)\n", |
1940 | netdev->name); | 1940 | netdev->name); |
1941 | bnx2fc_netdev_cleanup(interface); | 1941 | bnx2fc_interface_cleanup(interface); |
1942 | rc = -EINVAL; | 1942 | rc = -EINVAL; |
1943 | goto if_create_err; | 1943 | goto if_create_err; |
1944 | } | 1944 | } |
@@ -2057,7 +2057,7 @@ static void bnx2fc_ulp_exit(struct cnic_dev *dev) | |||
2057 | list_for_each_entry_safe(interface, tmp, &if_list, list) { | 2057 | list_for_each_entry_safe(interface, tmp, &if_list, list) { |
2058 | /* destroy not called yet, move to quiesced list */ | 2058 | /* destroy not called yet, move to quiesced list */ |
2059 | if (interface->hba == hba) { | 2059 | if (interface->hba == hba) { |
2060 | bnx2fc_netdev_cleanup(interface); | 2060 | bnx2fc_interface_cleanup(interface); |
2061 | bnx2fc_stop(interface); | 2061 | bnx2fc_stop(interface); |
2062 | 2062 | ||
2063 | list_del(&interface->list); | 2063 | list_del(&interface->list); |