diff options
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 47 | ||||
-rw-r--r-- | drivers/scsi/fcoe/libfcoe.c | 2 |
2 files changed, 21 insertions, 28 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 7bd0e822459d..8ad126556249 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
@@ -57,7 +57,7 @@ DEFINE_RWLOCK(fcoe_hostlist_lock); | |||
57 | DEFINE_TIMER(fcoe_timer, NULL, 0, 0); | 57 | DEFINE_TIMER(fcoe_timer, NULL, 0, 0); |
58 | DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu); | 58 | DEFINE_PER_CPU(struct fcoe_percpu_s, fcoe_percpu); |
59 | 59 | ||
60 | /* Function Prototyes */ | 60 | /* Function Prototypes */ |
61 | static int fcoe_reset(struct Scsi_Host *shost); | 61 | static int fcoe_reset(struct Scsi_Host *shost); |
62 | static int fcoe_xmit(struct fc_lport *, struct fc_frame *); | 62 | static int fcoe_xmit(struct fc_lport *, struct fc_frame *); |
63 | static int fcoe_rcv(struct sk_buff *, struct net_device *, | 63 | static int fcoe_rcv(struct sk_buff *, struct net_device *, |
@@ -138,7 +138,6 @@ static struct scsi_host_template fcoe_shost_template = { | |||
138 | /** | 138 | /** |
139 | * fcoe_lport_config() - sets up the fc_lport | 139 | * fcoe_lport_config() - sets up the fc_lport |
140 | * @lp: ptr to the fc_lport | 140 | * @lp: ptr to the fc_lport |
141 | * @shost: ptr to the parent scsi host | ||
142 | * | 141 | * |
143 | * Returns: 0 for success | 142 | * Returns: 0 for success |
144 | */ | 143 | */ |
@@ -380,7 +379,7 @@ static int fcoe_if_destroy(struct net_device *netdev) | |||
380 | dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); | 379 | dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); |
381 | rtnl_unlock(); | 380 | rtnl_unlock(); |
382 | 381 | ||
383 | /* Free the per-CPU revieve threads */ | 382 | /* Free the per-CPU receive threads */ |
384 | fcoe_percpu_clean(lp); | 383 | fcoe_percpu_clean(lp); |
385 | 384 | ||
386 | /* Free existing skbs */ | 385 | /* Free existing skbs */ |
@@ -720,7 +719,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) | |||
720 | } | 719 | } |
721 | #else | 720 | #else |
722 | /* | 721 | /* |
723 | * This a non-SMP scenario where the singluar Rx thread is | 722 | * This a non-SMP scenario where the singular Rx thread is |
724 | * being removed. Free all skbs and stop the thread. | 723 | * being removed. Free all skbs and stop the thread. |
725 | */ | 724 | */ |
726 | spin_lock_bh(&p->fcoe_rx_list.lock); | 725 | spin_lock_bh(&p->fcoe_rx_list.lock); |
@@ -777,7 +776,7 @@ static struct notifier_block fcoe_cpu_notifier = { | |||
777 | * @skb: the receive skb | 776 | * @skb: the receive skb |
778 | * @dev: associated net device | 777 | * @dev: associated net device |
779 | * @ptype: context | 778 | * @ptype: context |
780 | * @odldev: last device | 779 | * @olddev: last device |
781 | * | 780 | * |
782 | * this function will receive the packet and build fc frame and pass it up | 781 | * this function will receive the packet and build fc frame and pass it up |
783 | * | 782 | * |
@@ -904,7 +903,7 @@ static inline int fcoe_start_io(struct sk_buff *skb) | |||
904 | } | 903 | } |
905 | 904 | ||
906 | /** | 905 | /** |
907 | * fcoe_get_paged_crc_eof() - in case we need alloc a page for crc_eof | 906 | * fcoe_get_paged_crc_eof() - in case we need to alloc a page for crc_eof |
908 | * @skb: the skb to be xmitted | 907 | * @skb: the skb to be xmitted |
909 | * @tlen: total len | 908 | * @tlen: total len |
910 | * | 909 | * |
@@ -946,7 +945,7 @@ static int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen) | |||
946 | 945 | ||
947 | /** | 946 | /** |
948 | * fcoe_fc_crc() - calculates FC CRC in this fcoe skb | 947 | * fcoe_fc_crc() - calculates FC CRC in this fcoe skb |
949 | * @fp: the fc_frame containg data to be checksummed | 948 | * @fp: the fc_frame containing data to be checksummed |
950 | * | 949 | * |
951 | * This uses crc32() to calculate the crc for fc frame | 950 | * This uses crc32() to calculate the crc for fc frame |
952 | * Return : 32 bit crc | 951 | * Return : 32 bit crc |
@@ -1061,7 +1060,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1061 | cp = NULL; | 1060 | cp = NULL; |
1062 | } | 1061 | } |
1063 | 1062 | ||
1064 | /* adjust skb netowrk/transport offsets to match mac/fcoe/fc */ | 1063 | /* adjust skb network/transport offsets to match mac/fcoe/fc */ |
1065 | skb_push(skb, elen + hlen); | 1064 | skb_push(skb, elen + hlen); |
1066 | skb_reset_mac_header(skb); | 1065 | skb_reset_mac_header(skb); |
1067 | skb_reset_network_header(skb); | 1066 | skb_reset_network_header(skb); |
@@ -1294,17 +1293,16 @@ void fcoe_watchdog(ulong vp) | |||
1294 | 1293 | ||
1295 | 1294 | ||
1296 | /** | 1295 | /** |
1297 | * fcoe_check_wait_queue() - put the skb into fcoe pending xmit queue | 1296 | * fcoe_check_wait_queue() - attempt to clear the transmit backlog |
1298 | * @lp: the fc_port for this skb | 1297 | * @lp: the fc_lport |
1299 | * @skb: the associated skb to be xmitted | ||
1300 | * | 1298 | * |
1301 | * This empties the wait_queue, dequeue the head of the wait_queue queue | 1299 | * This empties the wait_queue, dequeue the head of the wait_queue queue |
1302 | * and calls fcoe_start_io() for each packet, if all skb have been | 1300 | * and calls fcoe_start_io() for each packet, if all skb have been |
1303 | * transmitted, return qlen or -1 if a error occurs, then restore | 1301 | * transmitted, return qlen or -1 if a error occurs, then restore |
1304 | * wait_queue and try again later. | 1302 | * wait_queue and try again later. |
1305 | * | 1303 | * |
1306 | * The wait_queue is used when the skb transmit fails. skb will go | 1304 | * The wait_queue is used when the skb transmit fails. skb will go |
1307 | * in the wait_queue which will be emptied by the time function OR | 1305 | * in the wait_queue which will be emptied by the timer function or |
1308 | * by the next skb transmit. | 1306 | * by the next skb transmit. |
1309 | * | 1307 | * |
1310 | * Returns: 0 for success | 1308 | * Returns: 0 for success |
@@ -1353,10 +1351,6 @@ out: | |||
1353 | */ | 1351 | */ |
1354 | static void fcoe_dev_setup() | 1352 | static void fcoe_dev_setup() |
1355 | { | 1353 | { |
1356 | /* | ||
1357 | * here setup a interface specific wd time to | ||
1358 | * monitor the link state | ||
1359 | */ | ||
1360 | register_netdevice_notifier(&fcoe_notifier); | 1354 | register_netdevice_notifier(&fcoe_notifier); |
1361 | } | 1355 | } |
1362 | 1356 | ||
@@ -1435,10 +1429,9 @@ out: | |||
1435 | 1429 | ||
1436 | /** | 1430 | /** |
1437 | * fcoe_if_to_netdev() - parse a name buffer to get netdev | 1431 | * fcoe_if_to_netdev() - parse a name buffer to get netdev |
1438 | * @ifname: fixed array for output parsed ifname | ||
1439 | * @buffer: incoming buffer to be copied | 1432 | * @buffer: incoming buffer to be copied |
1440 | * | 1433 | * |
1441 | * Returns: NULL or ptr to netdeive | 1434 | * Returns: NULL or ptr to net_device |
1442 | */ | 1435 | */ |
1443 | static struct net_device *fcoe_if_to_netdev(const char *buffer) | 1436 | static struct net_device *fcoe_if_to_netdev(const char *buffer) |
1444 | { | 1437 | { |
@@ -1456,7 +1449,7 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer) | |||
1456 | } | 1449 | } |
1457 | 1450 | ||
1458 | /** | 1451 | /** |
1459 | * fcoe_netdev_to_module_owner() - finds out the nic drive moddule of the netdev | 1452 | * fcoe_netdev_to_module_owner() - finds out the driver module of the netdev |
1460 | * @netdev: the target netdev | 1453 | * @netdev: the target netdev |
1461 | * | 1454 | * |
1462 | * Returns: ptr to the struct module, NULL for failure | 1455 | * Returns: ptr to the struct module, NULL for failure |
@@ -1486,7 +1479,7 @@ fcoe_netdev_to_module_owner(const struct net_device *netdev) | |||
1486 | * Holds the Ethernet driver module by try_module_get() for | 1479 | * Holds the Ethernet driver module by try_module_get() for |
1487 | * the corresponding netdev. | 1480 | * the corresponding netdev. |
1488 | * | 1481 | * |
1489 | * Returns: 0 for succsss | 1482 | * Returns: 0 for success |
1490 | */ | 1483 | */ |
1491 | static int fcoe_ethdrv_get(const struct net_device *netdev) | 1484 | static int fcoe_ethdrv_get(const struct net_device *netdev) |
1492 | { | 1485 | { |
@@ -1508,7 +1501,7 @@ static int fcoe_ethdrv_get(const struct net_device *netdev) | |||
1508 | * Releases the Ethernet driver module by module_put for | 1501 | * Releases the Ethernet driver module by module_put for |
1509 | * the corresponding netdev. | 1502 | * the corresponding netdev. |
1510 | * | 1503 | * |
1511 | * Returns: 0 for succsss | 1504 | * Returns: 0 for success |
1512 | */ | 1505 | */ |
1513 | static int fcoe_ethdrv_put(const struct net_device *netdev) | 1506 | static int fcoe_ethdrv_put(const struct net_device *netdev) |
1514 | { | 1507 | { |
@@ -1526,7 +1519,7 @@ static int fcoe_ethdrv_put(const struct net_device *netdev) | |||
1526 | 1519 | ||
1527 | /** | 1520 | /** |
1528 | * fcoe_destroy() - handles the destroy from sysfs | 1521 | * fcoe_destroy() - handles the destroy from sysfs |
1529 | * @buffer: expcted to be a eth if name | 1522 | * @buffer: expected to be an eth if name |
1530 | * @kp: associated kernel param | 1523 | * @kp: associated kernel param |
1531 | * | 1524 | * |
1532 | * Returns: 0 for success | 1525 | * Returns: 0 for success |
@@ -1563,7 +1556,7 @@ out_nodev: | |||
1563 | 1556 | ||
1564 | /** | 1557 | /** |
1565 | * fcoe_create() - Handles the create call from sysfs | 1558 | * fcoe_create() - Handles the create call from sysfs |
1566 | * @buffer: expcted to be a eth if name | 1559 | * @buffer: expected to be an eth if name |
1567 | * @kp: associated kernel param | 1560 | * @kp: associated kernel param |
1568 | * | 1561 | * |
1569 | * Returns: 0 for success | 1562 | * Returns: 0 for success |
@@ -1717,7 +1710,7 @@ int fcoe_reset(struct Scsi_Host *shost) | |||
1717 | 1710 | ||
1718 | /** | 1711 | /** |
1719 | * fcoe_hostlist_lookup_softc() - find the corresponding lport by a given device | 1712 | * fcoe_hostlist_lookup_softc() - find the corresponding lport by a given device |
1720 | * @device: this is currently ptr to net_device | 1713 | * @dev: this is currently ptr to net_device |
1721 | * | 1714 | * |
1722 | * Returns: NULL or the located fcoe_softc | 1715 | * Returns: NULL or the located fcoe_softc |
1723 | */ | 1716 | */ |
@@ -1754,7 +1747,7 @@ struct fc_lport *fcoe_hostlist_lookup(const struct net_device *netdev) | |||
1754 | 1747 | ||
1755 | /** | 1748 | /** |
1756 | * fcoe_hostlist_add() - Add a lport to lports list | 1749 | * fcoe_hostlist_add() - Add a lport to lports list |
1757 | * @lp: ptr to the fc_lport to badded | 1750 | * @lp: ptr to the fc_lport to be added |
1758 | * | 1751 | * |
1759 | * Returns: 0 for success | 1752 | * Returns: 0 for success |
1760 | */ | 1753 | */ |
@@ -1774,7 +1767,7 @@ int fcoe_hostlist_add(const struct fc_lport *lp) | |||
1774 | 1767 | ||
1775 | /** | 1768 | /** |
1776 | * fcoe_hostlist_remove() - remove a lport from lports list | 1769 | * fcoe_hostlist_remove() - remove a lport from lports list |
1777 | * @lp: ptr to the fc_lport to badded | 1770 | * @lp: ptr to the fc_lport to be removed |
1778 | * | 1771 | * |
1779 | * Returns: 0 for success | 1772 | * Returns: 0 for success |
1780 | */ | 1773 | */ |
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index f410f4abb548..62ba0f39c6bd 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c | |||
@@ -122,7 +122,7 @@ static void fcoe_ctlr_reset_fcfs(struct fcoe_ctlr *fip) | |||
122 | } | 122 | } |
123 | 123 | ||
124 | /** | 124 | /** |
125 | * fcoe_ctrl_destroy() - Disable and tear-down the FCoE controller. | 125 | * fcoe_ctlr_destroy() - Disable and tear-down the FCoE controller. |
126 | * @fip: FCoE controller. | 126 | * @fip: FCoE controller. |
127 | * | 127 | * |
128 | * This is called by FCoE drivers before freeing the &fcoe_ctlr. | 128 | * This is called by FCoE drivers before freeing the &fcoe_ctlr. |