diff options
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 59 | ||||
-rw-r--r-- | drivers/scsi/fcoe/libfcoe.c | 2 |
2 files changed, 23 insertions, 38 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 94e1e3189773..03e1926f40b5 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 | */ |
@@ -256,6 +255,7 @@ static int fcoe_netdev_config(struct fc_lport *lp, struct net_device *netdev) | |||
256 | rtnl_lock(); | 255 | rtnl_lock(); |
257 | memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); | 256 | memcpy(flogi_maddr, (u8[6]) FC_FCOE_FLOGI_MAC, ETH_ALEN); |
258 | dev_unicast_add(fc->real_dev, flogi_maddr, ETH_ALEN); | 257 | dev_unicast_add(fc->real_dev, flogi_maddr, ETH_ALEN); |
258 | dev_mc_add(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); | ||
259 | rtnl_unlock(); | 259 | rtnl_unlock(); |
260 | 260 | ||
261 | /* | 261 | /* |
@@ -380,7 +380,7 @@ static int fcoe_if_destroy(struct net_device *netdev) | |||
380 | dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); | 380 | dev_mc_delete(fc->real_dev, FIP_ALL_ENODE_MACS, ETH_ALEN, 0); |
381 | rtnl_unlock(); | 381 | rtnl_unlock(); |
382 | 382 | ||
383 | /* Free the per-CPU revieve threads */ | 383 | /* Free the per-CPU receive threads */ |
384 | fcoe_percpu_clean(lp); | 384 | fcoe_percpu_clean(lp); |
385 | 385 | ||
386 | /* Free existing skbs */ | 386 | /* Free existing skbs */ |
@@ -720,7 +720,7 @@ static void fcoe_percpu_thread_destroy(unsigned int cpu) | |||
720 | } | 720 | } |
721 | #else | 721 | #else |
722 | /* | 722 | /* |
723 | * This a non-SMP scenario where the singluar Rx thread is | 723 | * This a non-SMP scenario where the singular Rx thread is |
724 | * being removed. Free all skbs and stop the thread. | 724 | * being removed. Free all skbs and stop the thread. |
725 | */ | 725 | */ |
726 | spin_lock_bh(&p->fcoe_rx_list.lock); | 726 | spin_lock_bh(&p->fcoe_rx_list.lock); |
@@ -777,7 +777,7 @@ static struct notifier_block fcoe_cpu_notifier = { | |||
777 | * @skb: the receive skb | 777 | * @skb: the receive skb |
778 | * @dev: associated net device | 778 | * @dev: associated net device |
779 | * @ptype: context | 779 | * @ptype: context |
780 | * @odldev: last device | 780 | * @olddev: last device |
781 | * | 781 | * |
782 | * this function will receive the packet and build fc frame and pass it up | 782 | * this function will receive the packet and build fc frame and pass it up |
783 | * | 783 | * |
@@ -884,7 +884,6 @@ err2: | |||
884 | kfree_skb(skb); | 884 | kfree_skb(skb); |
885 | return -1; | 885 | return -1; |
886 | } | 886 | } |
887 | EXPORT_SYMBOL_GPL(fcoe_rcv); | ||
888 | 887 | ||
889 | /** | 888 | /** |
890 | * fcoe_start_io() - pass to netdev to start xmit for fcoe | 889 | * fcoe_start_io() - pass to netdev to start xmit for fcoe |
@@ -905,7 +904,7 @@ static inline int fcoe_start_io(struct sk_buff *skb) | |||
905 | } | 904 | } |
906 | 905 | ||
907 | /** | 906 | /** |
908 | * fcoe_get_paged_crc_eof() - in case we need alloc a page for crc_eof | 907 | * fcoe_get_paged_crc_eof() - in case we need to alloc a page for crc_eof |
909 | * @skb: the skb to be xmitted | 908 | * @skb: the skb to be xmitted |
910 | * @tlen: total len | 909 | * @tlen: total len |
911 | * | 910 | * |
@@ -947,7 +946,7 @@ static int fcoe_get_paged_crc_eof(struct sk_buff *skb, int tlen) | |||
947 | 946 | ||
948 | /** | 947 | /** |
949 | * fcoe_fc_crc() - calculates FC CRC in this fcoe skb | 948 | * fcoe_fc_crc() - calculates FC CRC in this fcoe skb |
950 | * @fp: the fc_frame containg data to be checksummed | 949 | * @fp: the fc_frame containing data to be checksummed |
951 | * | 950 | * |
952 | * This uses crc32() to calculate the crc for fc frame | 951 | * This uses crc32() to calculate the crc for fc frame |
953 | * Return : 32 bit crc | 952 | * Return : 32 bit crc |
@@ -1011,7 +1010,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1011 | wlen = skb->len / FCOE_WORD_TO_BYTE; | 1010 | wlen = skb->len / FCOE_WORD_TO_BYTE; |
1012 | 1011 | ||
1013 | if (!lp->link_up) { | 1012 | if (!lp->link_up) { |
1014 | kfree(skb); | 1013 | kfree_skb(skb); |
1015 | return 0; | 1014 | return 0; |
1016 | } | 1015 | } |
1017 | 1016 | ||
@@ -1062,7 +1061,7 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1062 | cp = NULL; | 1061 | cp = NULL; |
1063 | } | 1062 | } |
1064 | 1063 | ||
1065 | /* adjust skb netowrk/transport offsets to match mac/fcoe/fc */ | 1064 | /* adjust skb network/transport offsets to match mac/fcoe/fc */ |
1066 | skb_push(skb, elen + hlen); | 1065 | skb_push(skb, elen + hlen); |
1067 | skb_reset_mac_header(skb); | 1066 | skb_reset_mac_header(skb); |
1068 | skb_reset_network_header(skb); | 1067 | skb_reset_network_header(skb); |
@@ -1123,7 +1122,6 @@ int fcoe_xmit(struct fc_lport *lp, struct fc_frame *fp) | |||
1123 | 1122 | ||
1124 | return 0; | 1123 | return 0; |
1125 | } | 1124 | } |
1126 | EXPORT_SYMBOL_GPL(fcoe_xmit); | ||
1127 | 1125 | ||
1128 | /** | 1126 | /** |
1129 | * fcoe_percpu_receive_thread() - recv thread per cpu | 1127 | * fcoe_percpu_receive_thread() - recv thread per cpu |
@@ -1296,17 +1294,16 @@ void fcoe_watchdog(ulong vp) | |||
1296 | 1294 | ||
1297 | 1295 | ||
1298 | /** | 1296 | /** |
1299 | * fcoe_check_wait_queue() - put the skb into fcoe pending xmit queue | 1297 | * fcoe_check_wait_queue() - attempt to clear the transmit backlog |
1300 | * @lp: the fc_port for this skb | 1298 | * @lp: the fc_lport |
1301 | * @skb: the associated skb to be xmitted | ||
1302 | * | 1299 | * |
1303 | * This empties the wait_queue, dequeue the head of the wait_queue queue | 1300 | * This empties the wait_queue, dequeue the head of the wait_queue queue |
1304 | * and calls fcoe_start_io() for each packet, if all skb have been | 1301 | * and calls fcoe_start_io() for each packet, if all skb have been |
1305 | * transmitted, return qlen or -1 if a error occurs, then restore | 1302 | * transmitted, return qlen or -1 if a error occurs, then restore |
1306 | * wait_queue and try again later. | 1303 | * wait_queue and try again later. |
1307 | * | 1304 | * |
1308 | * The wait_queue is used when the skb transmit fails. skb will go | 1305 | * The wait_queue is used when the skb transmit fails. skb will go |
1309 | * in the wait_queue which will be emptied by the time function OR | 1306 | * in the wait_queue which will be emptied by the timer function or |
1310 | * by the next skb transmit. | 1307 | * by the next skb transmit. |
1311 | * | 1308 | * |
1312 | * Returns: 0 for success | 1309 | * Returns: 0 for success |
@@ -1355,10 +1352,6 @@ out: | |||
1355 | */ | 1352 | */ |
1356 | static void fcoe_dev_setup() | 1353 | static void fcoe_dev_setup() |
1357 | { | 1354 | { |
1358 | /* | ||
1359 | * here setup a interface specific wd time to | ||
1360 | * monitor the link state | ||
1361 | */ | ||
1362 | register_netdevice_notifier(&fcoe_notifier); | 1355 | register_netdevice_notifier(&fcoe_notifier); |
1363 | } | 1356 | } |
1364 | 1357 | ||
@@ -1437,10 +1430,9 @@ out: | |||
1437 | 1430 | ||
1438 | /** | 1431 | /** |
1439 | * fcoe_if_to_netdev() - parse a name buffer to get netdev | 1432 | * fcoe_if_to_netdev() - parse a name buffer to get netdev |
1440 | * @ifname: fixed array for output parsed ifname | ||
1441 | * @buffer: incoming buffer to be copied | 1433 | * @buffer: incoming buffer to be copied |
1442 | * | 1434 | * |
1443 | * Returns: NULL or ptr to netdeive | 1435 | * Returns: NULL or ptr to net_device |
1444 | */ | 1436 | */ |
1445 | static struct net_device *fcoe_if_to_netdev(const char *buffer) | 1437 | static struct net_device *fcoe_if_to_netdev(const char *buffer) |
1446 | { | 1438 | { |
@@ -1458,7 +1450,7 @@ static struct net_device *fcoe_if_to_netdev(const char *buffer) | |||
1458 | } | 1450 | } |
1459 | 1451 | ||
1460 | /** | 1452 | /** |
1461 | * fcoe_netdev_to_module_owner() - finds out the nic drive moddule of the netdev | 1453 | * fcoe_netdev_to_module_owner() - finds out the driver module of the netdev |
1462 | * @netdev: the target netdev | 1454 | * @netdev: the target netdev |
1463 | * | 1455 | * |
1464 | * Returns: ptr to the struct module, NULL for failure | 1456 | * Returns: ptr to the struct module, NULL for failure |
@@ -1488,7 +1480,7 @@ fcoe_netdev_to_module_owner(const struct net_device *netdev) | |||
1488 | * Holds the Ethernet driver module by try_module_get() for | 1480 | * Holds the Ethernet driver module by try_module_get() for |
1489 | * the corresponding netdev. | 1481 | * the corresponding netdev. |
1490 | * | 1482 | * |
1491 | * Returns: 0 for succsss | 1483 | * Returns: 0 for success |
1492 | */ | 1484 | */ |
1493 | static int fcoe_ethdrv_get(const struct net_device *netdev) | 1485 | static int fcoe_ethdrv_get(const struct net_device *netdev) |
1494 | { | 1486 | { |
@@ -1510,7 +1502,7 @@ static int fcoe_ethdrv_get(const struct net_device *netdev) | |||
1510 | * Releases the Ethernet driver module by module_put for | 1502 | * Releases the Ethernet driver module by module_put for |
1511 | * the corresponding netdev. | 1503 | * the corresponding netdev. |
1512 | * | 1504 | * |
1513 | * Returns: 0 for succsss | 1505 | * Returns: 0 for success |
1514 | */ | 1506 | */ |
1515 | static int fcoe_ethdrv_put(const struct net_device *netdev) | 1507 | static int fcoe_ethdrv_put(const struct net_device *netdev) |
1516 | { | 1508 | { |
@@ -1528,7 +1520,7 @@ static int fcoe_ethdrv_put(const struct net_device *netdev) | |||
1528 | 1520 | ||
1529 | /** | 1521 | /** |
1530 | * fcoe_destroy() - handles the destroy from sysfs | 1522 | * fcoe_destroy() - handles the destroy from sysfs |
1531 | * @buffer: expcted to be a eth if name | 1523 | * @buffer: expected to be an eth if name |
1532 | * @kp: associated kernel param | 1524 | * @kp: associated kernel param |
1533 | * | 1525 | * |
1534 | * Returns: 0 for success | 1526 | * Returns: 0 for success |
@@ -1565,7 +1557,7 @@ out_nodev: | |||
1565 | 1557 | ||
1566 | /** | 1558 | /** |
1567 | * fcoe_create() - Handles the create call from sysfs | 1559 | * fcoe_create() - Handles the create call from sysfs |
1568 | * @buffer: expcted to be a eth if name | 1560 | * @buffer: expected to be an eth if name |
1569 | * @kp: associated kernel param | 1561 | * @kp: associated kernel param |
1570 | * | 1562 | * |
1571 | * Returns: 0 for success | 1563 | * Returns: 0 for success |
@@ -1652,7 +1644,6 @@ int fcoe_link_ok(struct fc_lport *lp) | |||
1652 | 1644 | ||
1653 | return rc; | 1645 | return rc; |
1654 | } | 1646 | } |
1655 | EXPORT_SYMBOL_GPL(fcoe_link_ok); | ||
1656 | 1647 | ||
1657 | /** | 1648 | /** |
1658 | * fcoe_percpu_clean() - Clear the pending skbs for an lport | 1649 | * fcoe_percpu_clean() - Clear the pending skbs for an lport |
@@ -1684,7 +1675,6 @@ void fcoe_percpu_clean(struct fc_lport *lp) | |||
1684 | spin_unlock_bh(&pp->fcoe_rx_list.lock); | 1675 | spin_unlock_bh(&pp->fcoe_rx_list.lock); |
1685 | } | 1676 | } |
1686 | } | 1677 | } |
1687 | EXPORT_SYMBOL_GPL(fcoe_percpu_clean); | ||
1688 | 1678 | ||
1689 | /** | 1679 | /** |
1690 | * fcoe_clean_pending_queue() - Dequeue a skb and free it | 1680 | * fcoe_clean_pending_queue() - Dequeue a skb and free it |
@@ -1705,7 +1695,6 @@ void fcoe_clean_pending_queue(struct fc_lport *lp) | |||
1705 | } | 1695 | } |
1706 | spin_unlock_bh(&fc->fcoe_pending_queue.lock); | 1696 | spin_unlock_bh(&fc->fcoe_pending_queue.lock); |
1707 | } | 1697 | } |
1708 | EXPORT_SYMBOL_GPL(fcoe_clean_pending_queue); | ||
1709 | 1698 | ||
1710 | /** | 1699 | /** |
1711 | * fcoe_reset() - Resets the fcoe | 1700 | * fcoe_reset() - Resets the fcoe |
@@ -1719,11 +1708,10 @@ int fcoe_reset(struct Scsi_Host *shost) | |||
1719 | fc_lport_reset(lport); | 1708 | fc_lport_reset(lport); |
1720 | return 0; | 1709 | return 0; |
1721 | } | 1710 | } |
1722 | EXPORT_SYMBOL_GPL(fcoe_reset); | ||
1723 | 1711 | ||
1724 | /** | 1712 | /** |
1725 | * fcoe_hostlist_lookup_softc() - find the corresponding lport by a given device | 1713 | * fcoe_hostlist_lookup_softc() - find the corresponding lport by a given device |
1726 | * @device: this is currently ptr to net_device | 1714 | * @dev: this is currently ptr to net_device |
1727 | * | 1715 | * |
1728 | * Returns: NULL or the located fcoe_softc | 1716 | * Returns: NULL or the located fcoe_softc |
1729 | */ | 1717 | */ |
@@ -1757,11 +1745,10 @@ struct fc_lport *fcoe_hostlist_lookup(const struct net_device *netdev) | |||
1757 | 1745 | ||
1758 | return (fc) ? fc->ctlr.lp : NULL; | 1746 | return (fc) ? fc->ctlr.lp : NULL; |
1759 | } | 1747 | } |
1760 | EXPORT_SYMBOL_GPL(fcoe_hostlist_lookup); | ||
1761 | 1748 | ||
1762 | /** | 1749 | /** |
1763 | * fcoe_hostlist_add() - Add a lport to lports list | 1750 | * fcoe_hostlist_add() - Add a lport to lports list |
1764 | * @lp: ptr to the fc_lport to badded | 1751 | * @lp: ptr to the fc_lport to be added |
1765 | * | 1752 | * |
1766 | * Returns: 0 for success | 1753 | * Returns: 0 for success |
1767 | */ | 1754 | */ |
@@ -1778,11 +1765,10 @@ int fcoe_hostlist_add(const struct fc_lport *lp) | |||
1778 | } | 1765 | } |
1779 | return 0; | 1766 | return 0; |
1780 | } | 1767 | } |
1781 | EXPORT_SYMBOL_GPL(fcoe_hostlist_add); | ||
1782 | 1768 | ||
1783 | /** | 1769 | /** |
1784 | * fcoe_hostlist_remove() - remove a lport from lports list | 1770 | * fcoe_hostlist_remove() - remove a lport from lports list |
1785 | * @lp: ptr to the fc_lport to badded | 1771 | * @lp: ptr to the fc_lport to be removed |
1786 | * | 1772 | * |
1787 | * Returns: 0 for success | 1773 | * Returns: 0 for success |
1788 | */ | 1774 | */ |
@@ -1798,7 +1784,6 @@ int fcoe_hostlist_remove(const struct fc_lport *lp) | |||
1798 | 1784 | ||
1799 | return 0; | 1785 | return 0; |
1800 | } | 1786 | } |
1801 | EXPORT_SYMBOL_GPL(fcoe_hostlist_remove); | ||
1802 | 1787 | ||
1803 | /** | 1788 | /** |
1804 | * fcoe_init() - fcoe module loading initialization | 1789 | * fcoe_init() - fcoe module loading initialization |
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. |