Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge branch 's390-next'

Karsten Graul says:

====================
s390/net: updates 2021-09-14

Please apply the following patches to netdev's net-next tree.

Stop using the wrappers in include/linux/pci-dma-compat.h,
and fix warnings about incorrect kernel-doc comments.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

+168 -167
+30 -30
drivers/s390/net/ctcm_fsms.c
··· 182 182 static void ctcmpc_chx_resend(fsm_instance *, int, void *); 183 183 static void ctcmpc_chx_send_sweep(fsm_instance *fsm, int event, void *arg); 184 184 185 - /** 185 + /* 186 186 * Check return code of a preceding ccw_device call, halt_IO etc... 187 187 * 188 188 * ch : The channel, the error belongs to. ··· 223 223 } 224 224 } 225 225 226 - /** 226 + /* 227 227 * NOP action for statemachines 228 228 */ 229 229 static void ctcm_action_nop(fsm_instance *fi, int event, void *arg) ··· 234 234 * Actions for channel - statemachines. 235 235 */ 236 236 237 - /** 237 + /* 238 238 * Normal data has been send. Free the corresponding 239 239 * skb (it's in io_queue), reset dev->tbusy and 240 240 * revert to idle state. ··· 322 322 ctcm_clear_busy_do(dev); 323 323 } 324 324 325 - /** 325 + /* 326 326 * Initial data is sent. 327 327 * Notify device statemachine that we are up and 328 328 * running. ··· 344 344 fsm_event(priv->fsm, DEV_EVENT_TXUP, ch->netdev); 345 345 } 346 346 347 - /** 347 + /* 348 348 * Got normal data, check for sanity, queue it up, allocate new buffer 349 349 * trigger bottom half, and initiate next read. 350 350 * ··· 421 421 ctcm_ccw_check_rc(ch, rc, "normal RX"); 422 422 } 423 423 424 - /** 424 + /* 425 425 * Initialize connection by sending a __u16 of value 0. 426 426 * 427 427 * fi An instance of a channel statemachine. ··· 497 497 } 498 498 } 499 499 500 - /** 500 + /* 501 501 * Got initial data, check it. If OK, 502 502 * notify device statemachine that we are up and 503 503 * running. ··· 538 538 } 539 539 } 540 540 541 - /** 541 + /* 542 542 * Set channel into extended mode. 543 543 * 544 544 * fi An instance of a channel statemachine. ··· 578 578 ch->retry = 0; 579 579 } 580 580 581 - /** 581 + /* 582 582 * Setup channel. 583 583 * 584 584 * fi An instance of a channel statemachine. ··· 641 641 } 642 642 } 643 643 644 - /** 644 + /* 645 645 * Shutdown a channel. 646 646 * 647 647 * fi An instance of a channel statemachine. ··· 682 682 } 683 683 } 684 684 685 - /** 685 + /* 686 686 * Cleanup helper for chx_fail and chx_stopped 687 687 * cleanup channels queue and notify interface statemachine. 688 688 * ··· 728 728 } 729 729 } 730 730 731 - /** 731 + /* 732 732 * A channel has successfully been halted. 733 733 * Cleanup it's queue and notify interface statemachine. 734 734 * ··· 741 741 ctcm_chx_cleanup(fi, CTC_STATE_STOPPED, arg); 742 742 } 743 743 744 - /** 744 + /* 745 745 * A stop command from device statemachine arrived and we are in 746 746 * not operational mode. Set state to stopped. 747 747 * ··· 754 754 fsm_newstate(fi, CTC_STATE_STOPPED); 755 755 } 756 756 757 - /** 757 + /* 758 758 * A machine check for no path, not operational status or gone device has 759 759 * happened. 760 760 * Cleanup queue and notify interface statemachine. ··· 768 768 ctcm_chx_cleanup(fi, CTC_STATE_NOTOP, arg); 769 769 } 770 770 771 - /** 771 + /* 772 772 * Handle error during setup of channel. 773 773 * 774 774 * fi An instance of a channel statemachine. ··· 817 817 } 818 818 } 819 819 820 - /** 820 + /* 821 821 * Restart a channel after an error. 822 822 * 823 823 * fi An instance of a channel statemachine. ··· 858 858 } 859 859 } 860 860 861 - /** 861 + /* 862 862 * Handle error during RX initial handshake (exchange of 863 863 * 0-length block header) 864 864 * ··· 893 893 } 894 894 } 895 895 896 - /** 896 + /* 897 897 * Notify device statemachine if we gave up initialization 898 898 * of RX channel. 899 899 * ··· 914 914 fsm_event(priv->fsm, DEV_EVENT_RXDOWN, dev); 915 915 } 916 916 917 - /** 917 + /* 918 918 * Handle RX Unit check remote reset (remote disconnected) 919 919 * 920 920 * fi An instance of a channel statemachine. ··· 946 946 ccw_device_halt(ch2->cdev, 0); 947 947 } 948 948 949 - /** 949 + /* 950 950 * Handle error during TX channel initialization. 951 951 * 952 952 * fi An instance of a channel statemachine. ··· 978 978 } 979 979 } 980 980 981 - /** 981 + /* 982 982 * Handle TX timeout by retrying operation. 983 983 * 984 984 * fi An instance of a channel statemachine. ··· 1050 1050 return; 1051 1051 } 1052 1052 1053 - /** 1053 + /* 1054 1054 * Handle fatal errors during an I/O command. 1055 1055 * 1056 1056 * fi An instance of a channel statemachine. ··· 1198 1198 * Actions for mpc channel statemachine. 1199 1199 */ 1200 1200 1201 - /** 1201 + /* 1202 1202 * Normal data has been send. Free the corresponding 1203 1203 * skb (it's in io_queue), reset dev->tbusy and 1204 1204 * revert to idle state. ··· 1361 1361 return; 1362 1362 } 1363 1363 1364 - /** 1364 + /* 1365 1365 * Got normal data, check for sanity, queue it up, allocate new buffer 1366 1366 * trigger bottom half, and initiate next read. 1367 1367 * ··· 1464 1464 1465 1465 } 1466 1466 1467 - /** 1467 + /* 1468 1468 * Initialize connection by sending a __u16 of value 0. 1469 1469 * 1470 1470 * fi An instance of a channel statemachine. ··· 1516 1516 return; 1517 1517 } 1518 1518 1519 - /** 1519 + /* 1520 1520 * Got initial data, check it. If OK, 1521 1521 * notify device statemachine that we are up and 1522 1522 * running. ··· 2043 2043 * Actions for interface - statemachine. 2044 2044 */ 2045 2045 2046 - /** 2046 + /* 2047 2047 * Startup channels by sending CTC_EVENT_START to each channel. 2048 2048 * 2049 2049 * fi An instance of an interface statemachine. ··· 2068 2068 } 2069 2069 } 2070 2070 2071 - /** 2071 + /* 2072 2072 * Shutdown channels by sending CTC_EVENT_STOP to each channel. 2073 2073 * 2074 2074 * fi An instance of an interface statemachine. ··· 2122 2122 DEV_EVENT_START, dev); 2123 2123 } 2124 2124 2125 - /** 2125 + /* 2126 2126 * Called from channel statemachine 2127 2127 * when a channel is up and running. 2128 2128 * ··· 2183 2183 } 2184 2184 } 2185 2185 2186 - /** 2186 + /* 2187 2187 * Called from device statemachine 2188 2188 * when a channel has been shutdown. 2189 2189 *
+19 -19
drivers/s390/net/ctcm_main.c
··· 55 55 56 56 /* Some common global variables */ 57 57 58 - /** 58 + /* 59 59 * The root device for ctcm group devices 60 60 */ 61 61 static struct device *ctcm_root_dev; ··· 65 65 */ 66 66 struct channel *channels; 67 67 68 - /** 68 + /* 69 69 * Unpack a just received skb and hand it over to 70 70 * upper layers. 71 71 * ··· 180 180 } 181 181 } 182 182 183 - /** 183 + /* 184 184 * Release a specific channel in the channel list. 185 185 * 186 186 * ch Pointer to channel struct to be released. ··· 192 192 fsm_newstate(ch->fsm, CTC_STATE_IDLE); 193 193 } 194 194 195 - /** 195 + /* 196 196 * Remove a specific channel in the channel list. 197 197 * 198 198 * ch Pointer to channel struct to be released. ··· 240 240 chid, ok ? "OK" : "failed"); 241 241 } 242 242 243 - /** 243 + /* 244 244 * Get a specific channel from the channel list. 245 245 * 246 246 * type Type of channel we are interested in. ··· 300 300 } 301 301 302 302 303 - /** 303 + /* 304 304 * Check sense of a unit check. 305 305 * 306 306 * ch The channel, the sense code belongs to. ··· 414 414 * Interface API for upper network layers 415 415 */ 416 416 417 - /** 417 + /* 418 418 * Open an interface. 419 419 * Called from generic network layer when ifconfig up is run. 420 420 * ··· 432 432 return 0; 433 433 } 434 434 435 - /** 435 + /* 436 436 * Close an interface. 437 437 * Called from generic network layer when ifconfig down is run. 438 438 * ··· 451 451 } 452 452 453 453 454 - /** 454 + /* 455 455 * Transmit a packet. 456 456 * This is a helper function for ctcm_tx(). 457 457 * ··· 822 822 return rc; 823 823 } 824 824 825 - /** 825 + /* 826 826 * Start transmission of a packet. 827 827 * Called from generic network device layer. 828 828 * ··· 975 975 } 976 976 977 977 978 - /** 978 + /* 979 979 * Sets MTU of an interface. 980 980 * 981 981 * dev Pointer to interface struct. ··· 1007 1007 return 0; 1008 1008 } 1009 1009 1010 - /** 1010 + /* 1011 1011 * Returns interface statistics of a device. 1012 1012 * 1013 1013 * dev Pointer to interface struct. ··· 1144 1144 return dev; 1145 1145 } 1146 1146 1147 - /** 1147 + /* 1148 1148 * Main IRQ handler. 1149 1149 * 1150 1150 * cdev The ccw_device the interrupt is for. ··· 1257 1257 .groups = ctcm_attr_groups, 1258 1258 }; 1259 1259 1260 - /** 1260 + /* 1261 1261 * Add ctcm specific attributes. 1262 1262 * Add ctcm private data. 1263 1263 * ··· 1293 1293 return 0; 1294 1294 } 1295 1295 1296 - /** 1296 + /* 1297 1297 * Add a new channel to the list of channels. 1298 1298 * Keeps the channel list sorted. 1299 1299 * ··· 1343 1343 snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev->dev)); 1344 1344 ch->type = type; 1345 1345 1346 - /** 1346 + /* 1347 1347 * "static" ccws are used in the following way: 1348 1348 * 1349 1349 * ccw[0..2] (Channel program for generic I/O): ··· 1471 1471 return type; 1472 1472 } 1473 1473 1474 - /** 1474 + /* 1475 1475 * 1476 1476 * Setup an interface. 1477 1477 * ··· 1595 1595 return result; 1596 1596 } 1597 1597 1598 - /** 1598 + /* 1599 1599 * Shutdown an interface. 1600 1600 * 1601 1601 * cgdev Device to be shut down. ··· 1738 1738 pr_info("CTCM driver initialized\n"); 1739 1739 } 1740 1740 1741 - /** 1741 + /* 1742 1742 * Initialize module. 1743 1743 * This is called just after the module is loaded. 1744 1744 *
+4 -4
drivers/s390/net/ctcm_mpc.c
··· 1016 1016 CTCM_PR_DEBUG("exit %s: ch=0x%p id=%s\n", __func__, ch, ch->id); 1017 1017 } 1018 1018 1019 - /** 1019 + /* 1020 1020 * Unpack a just received skb and hand it over to 1021 1021 * upper layers. 1022 1022 * special MPC version of unpack_skb. ··· 1211 1211 __func__, dev->name, ch, ch->id); 1212 1212 } 1213 1213 1214 - /** 1214 + /* 1215 1215 * tasklet helper for mpc's skb unpacking. 1216 1216 * 1217 1217 * ch The channel to work on. ··· 1320 1320 * CTCM_PROTO_MPC only 1321 1321 */ 1322 1322 1323 - /** 1323 + /* 1324 1324 * NOP action for statemachines 1325 1325 */ 1326 1326 static void mpc_action_nop(fsm_instance *fi, int event, void *arg) ··· 1426 1426 } 1427 1427 } 1428 1428 1429 - /** 1429 + /* 1430 1430 * Handle mpc group action timeout. 1431 1431 * MPC Group Station FSM action 1432 1432 * CTCM_PROTO_MPC only
+1 -1
drivers/s390/net/fsm.c
··· 1 1 // SPDX-License-Identifier: GPL-2.0 2 - /** 2 + /* 3 3 * A generic FSM based on fsm used in isdn4linux 4 4 * 5 5 */
+1 -1
drivers/s390/net/ism_drv.c
··· 555 555 if (ret) 556 556 goto err_disable; 557 557 558 - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); 558 + ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); 559 559 if (ret) 560 560 goto err_resource; 561 561
+61 -60
drivers/s390/net/lcs.c
··· 40 40 #error Cannot compile lcs.c without some net devices switched on. 41 41 #endif 42 42 43 - /** 43 + /* 44 44 * initialization string for output 45 45 */ 46 46 47 47 static char version[] __initdata = "LCS driver"; 48 48 49 - /** 49 + /* 50 50 * the root device for lcs group devices 51 51 */ 52 52 static struct device *lcs_root_dev; 53 53 54 - /** 54 + /* 55 55 * Some prototypes. 56 56 */ 57 57 static void lcs_tasklet(unsigned long); ··· 62 62 #endif /* CONFIG_IP_MULTICAST */ 63 63 static int lcs_recovery(void *ptr); 64 64 65 - /** 65 + /* 66 66 * Debug Facility Stuff 67 67 */ 68 68 static char debug_buffer[255]; 69 69 static debug_info_t *lcs_dbf_setup; 70 70 static debug_info_t *lcs_dbf_trace; 71 71 72 - /** 72 + /* 73 73 * LCS Debug Facility functions 74 74 */ 75 75 static void ··· 96 96 return 0; 97 97 } 98 98 99 - /** 99 + /* 100 100 * Allocate io buffers. 101 101 */ 102 102 static int ··· 123 123 return 0; 124 124 } 125 125 126 - /** 126 + /* 127 127 * Free io buffers. 128 128 */ 129 129 static void ··· 151 151 lcs_free_channel(channel); 152 152 } 153 153 154 - /** 154 + /* 155 155 * LCS free memory for card and channels. 156 156 */ 157 157 static void ··· 162 162 kfree(card); 163 163 } 164 164 165 - /** 165 + /* 166 166 * LCS alloc memory for card and channels 167 167 */ 168 168 static struct lcs_card * ··· 402 402 return rc; 403 403 } 404 404 405 - /** 405 + /* 406 406 * Initialize channels,card and state machines. 407 407 */ 408 408 static void ··· 451 451 spin_unlock_irqrestore(&card->ipm_lock, flags); 452 452 #endif 453 453 } 454 - /** 454 + 455 + /* 455 456 * Cleanup channels,card and state machines. 456 457 */ 457 458 static void ··· 469 468 lcs_cleanup_channel(&card->read); 470 469 } 471 470 472 - /** 471 + /* 473 472 * Start channel. 474 473 */ 475 474 static int ··· 518 517 } 519 518 520 519 521 - /** 520 + /* 522 521 * Stop channel. 523 522 */ 524 523 static int ··· 546 545 return 0; 547 546 } 548 547 549 - /** 548 + /* 550 549 * start read and write channel 551 550 */ 552 551 static int ··· 566 565 return rc; 567 566 } 568 567 569 - /** 568 + /* 570 569 * stop read and write channel 571 570 */ 572 571 static int ··· 578 577 return 0; 579 578 } 580 579 581 - /** 580 + /* 582 581 * Get empty buffer. 583 582 */ 584 583 static struct lcs_buffer * ··· 611 610 return buffer; 612 611 } 613 612 614 - /** 613 + /* 615 614 * Resume channel program if the channel is suspended. 616 615 */ 617 616 static int ··· 637 636 638 637 } 639 638 640 - /** 639 + /* 641 640 * Make a buffer ready for processing. 642 641 */ 643 642 static void __lcs_ready_buffer_bits(struct lcs_channel *channel, int index) ··· 679 678 return rc; 680 679 } 681 680 682 - /** 681 + /* 683 682 * Mark the buffer as processed. Take care of the suspend bit 684 683 * of the previous buffer. This function is called from 685 684 * interrupt context, so the lock must not be taken. ··· 713 712 return __lcs_resume_channel(channel); 714 713 } 715 714 716 - /** 715 + /* 717 716 * Put a processed buffer back to state empty. 718 717 */ 719 718 static void ··· 729 728 spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags); 730 729 } 731 730 732 - /** 731 + /* 733 732 * Get buffer for a lan command. 734 733 */ 735 734 static struct lcs_buffer * ··· 786 785 return reply; 787 786 } 788 787 789 - /** 788 + /* 790 789 * Notifier function for lancmd replies. Called from read irq. 791 790 */ 792 791 static void ··· 814 813 spin_unlock(&card->lock); 815 814 } 816 815 817 - /** 816 + /* 818 817 * Emit buffer of a lan command. 819 818 */ 820 819 static void ··· 878 877 return rc ? -EIO : 0; 879 878 } 880 879 881 - /** 880 + /* 882 881 * LCS startup command 883 882 */ 884 883 static int ··· 896 895 return lcs_send_lancmd(card, buffer, NULL); 897 896 } 898 897 899 - /** 898 + /* 900 899 * LCS shutdown command 901 900 */ 902 901 static int ··· 913 912 return lcs_send_lancmd(card, buffer, NULL); 914 913 } 915 914 916 - /** 915 + /* 917 916 * LCS lanstat command 918 917 */ 919 918 static void ··· 940 939 return lcs_send_lancmd(card, buffer, __lcs_lanstat_cb); 941 940 } 942 941 943 - /** 942 + /* 944 943 * send stoplan command 945 944 */ 946 945 static int ··· 959 958 return lcs_send_lancmd(card, buffer, NULL); 960 959 } 961 960 962 - /** 961 + /* 963 962 * send startlan command 964 963 */ 965 964 static void ··· 987 986 } 988 987 989 988 #ifdef CONFIG_IP_MULTICAST 990 - /** 989 + /* 991 990 * send setipm command (Multicast) 992 991 */ 993 992 static int ··· 1011 1010 return lcs_send_lancmd(card, buffer, NULL); 1012 1011 } 1013 1012 1014 - /** 1013 + /* 1015 1014 * send delipm command (Multicast) 1016 1015 */ 1017 1016 static int ··· 1035 1034 return lcs_send_lancmd(card, buffer, NULL); 1036 1035 } 1037 1036 1038 - /** 1037 + /* 1039 1038 * check if multicast is supported by LCS 1040 1039 */ 1041 1040 static void ··· 1075 1074 return -EOPNOTSUPP; 1076 1075 } 1077 1076 1078 - /** 1077 + /* 1079 1078 * set or del multicast address on LCS card 1080 1079 */ 1081 1080 static void ··· 1130 1129 spin_unlock_irqrestore(&card->ipm_lock, flags); 1131 1130 } 1132 1131 1133 - /** 1132 + /* 1134 1133 * get mac address for the relevant Multicast address 1135 1134 */ 1136 1135 static void ··· 1140 1139 ip_eth_mc_map(ipm, mac); 1141 1140 } 1142 1141 1143 - /** 1142 + /* 1144 1143 * function called by net device to handle multicast address relevant things 1145 1144 */ 1146 1145 static void lcs_remove_mc_addresses(struct lcs_card *card, ··· 1261 1260 } 1262 1261 #endif /* CONFIG_IP_MULTICAST */ 1263 1262 1264 - /** 1263 + /* 1265 1264 * function called by net device to 1266 1265 * handle multicast address relevant things 1267 1266 */ ··· 1356 1355 schedule_work(&card->kernel_thread_starter); 1357 1356 } 1358 1357 1359 - /** 1358 + /* 1360 1359 * IRQ Handler for LCS channels 1361 1360 */ 1362 1361 static void ··· 1440 1439 tasklet_schedule(&channel->irq_tasklet); 1441 1440 } 1442 1441 1443 - /** 1442 + /* 1444 1443 * Tasklet for IRQ handler 1445 1444 */ 1446 1445 static void ··· 1477 1476 wake_up(&channel->wait_q); 1478 1477 } 1479 1478 1480 - /** 1479 + /* 1481 1480 * Finish current tx buffer and make it ready for transmit. 1482 1481 */ 1483 1482 static void ··· 1491 1490 card->tx_emitted++; 1492 1491 } 1493 1492 1494 - /** 1493 + /* 1495 1494 * Callback for finished tx buffers. 1496 1495 */ 1497 1496 static void ··· 1516 1515 spin_unlock(&card->lock); 1517 1516 } 1518 1517 1519 - /** 1518 + /* 1520 1519 * Packet transmit function called by network stack 1521 1520 */ 1522 1521 static int ··· 1594 1593 return rc; 1595 1594 } 1596 1595 1597 - /** 1596 + /* 1598 1597 * send startlan and lanstat command to make LCS device ready 1599 1598 */ 1600 1599 static int ··· 1649 1648 return rc; 1650 1649 } 1651 1650 1652 - /** 1651 + /* 1653 1652 * LCS detect function 1654 1653 * setup channels and make them I/O ready 1655 1654 */ ··· 1681 1680 return rc; 1682 1681 } 1683 1682 1684 - /** 1683 + /* 1685 1684 * LCS Stop card 1686 1685 */ 1687 1686 static int ··· 1706 1705 return rc; 1707 1706 } 1708 1707 1709 - /** 1708 + /* 1710 1709 * Kernel Thread helper functions for LGW initiated commands 1711 1710 */ 1712 1711 static void ··· 1722 1721 #endif 1723 1722 } 1724 1723 1725 - /** 1724 + /* 1726 1725 * Process control frames. 1727 1726 */ 1728 1727 static void ··· 1749 1748 lcs_notify_lancmd_waiters(card, cmd); 1750 1749 } 1751 1750 1752 - /** 1751 + /* 1753 1752 * Unpack network packet. 1754 1753 */ 1755 1754 static void ··· 1780 1779 netif_rx(skb); 1781 1780 } 1782 1781 1783 - /** 1782 + /* 1784 1783 * LCS main routine to get packets and lancmd replies from the buffers 1785 1784 */ 1786 1785 static void ··· 1830 1829 lcs_ready_buffer(&card->read, buffer); 1831 1830 } 1832 1831 1833 - /** 1832 + /* 1834 1833 * get network statistics for ifconfig and other user programs 1835 1834 */ 1836 1835 static struct net_device_stats * ··· 1843 1842 return &card->stats; 1844 1843 } 1845 1844 1846 - /** 1845 + /* 1847 1846 * stop lcs device 1848 1847 * This function will be called by user doing ifconfig xxx down 1849 1848 */ ··· 1867 1866 return rc; 1868 1867 } 1869 1868 1870 - /** 1869 + /* 1871 1870 * start lcs device and make it runnable 1872 1871 * This function will be called by user doing ifconfig xxx up 1873 1872 */ ··· 1893 1892 return rc; 1894 1893 } 1895 1894 1896 - /** 1895 + /* 1897 1896 * show function for portno called by cat or similar things 1898 1897 */ 1899 1898 static ssize_t ··· 1909 1908 return sprintf(buf, "%d\n", card->portno); 1910 1909 } 1911 1910 1912 - /** 1911 + /* 1913 1912 * store the value which is piped to file portno 1914 1913 */ 1915 1914 static ssize_t ··· 2034 2033 .groups = lcs_attr_groups, 2035 2034 }; 2036 2035 2037 - /** 2036 + /* 2038 2037 * lcs_probe_device is called on establishing a new ccwgroup_device. 2039 2038 */ 2040 2039 static int ··· 2078 2077 return register_netdev(card->dev); 2079 2078 } 2080 2079 2081 - /** 2080 + /* 2082 2081 * lcs_new_device will be called by setting the group device online. 2083 2082 */ 2084 2083 static const struct net_device_ops lcs_netdev_ops = { ··· 2200 2199 return -ENODEV; 2201 2200 } 2202 2201 2203 - /** 2202 + /* 2204 2203 * lcs_shutdown_device, called when setting the group device offline. 2205 2204 */ 2206 2205 static int ··· 2241 2240 return __lcs_shutdown_device(ccwgdev, 0); 2242 2241 } 2243 2242 2244 - /** 2243 + /* 2245 2244 * drive lcs recovery after startup and startlan initiated by Lan Gateway 2246 2245 */ 2247 2246 static int ··· 2272 2271 return 0; 2273 2272 } 2274 2273 2275 - /** 2274 + /* 2276 2275 * lcs_remove_device, free buffers and card 2277 2276 */ 2278 2277 static void ··· 2316 2315 .int_class = IRQIO_LCS, 2317 2316 }; 2318 2317 2319 - /** 2318 + /* 2320 2319 * LCS ccwgroup driver registration 2321 2320 */ 2322 2321 static struct ccwgroup_driver lcs_group_driver = { ··· 2352 2351 NULL, 2353 2352 }; 2354 2353 2355 - /** 2354 + /* 2356 2355 * LCS Module/Kernel initialization function 2357 2356 */ 2358 2357 static int ··· 2390 2389 } 2391 2390 2392 2391 2393 - /** 2392 + /* 2394 2393 * LCS module cleanup function 2395 2394 */ 2396 2395 static void
+52 -52
drivers/s390/net/netiucv.c
··· 58 58 ("(C) 2001 IBM Corporation by Fritz Elfert (felfert@millenux.com)"); 59 59 MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver"); 60 60 61 - /** 61 + /* 62 62 * Debug Facility stuff 63 63 */ 64 64 #define IUCV_DBF_SETUP_NAME "iucv_setup" ··· 107 107 debug_sprintf_event(iucv_dbf_trace, level, text ); \ 108 108 } while (0) 109 109 110 - /** 110 + /* 111 111 * some more debug stuff 112 112 */ 113 113 #define PRINTK_HEADER " iucv: " /* for debugging */ ··· 118 118 .bus = &iucv_bus, 119 119 }; 120 120 121 - /** 121 + /* 122 122 * Per connection profiling data 123 123 */ 124 124 struct connection_profile { ··· 133 133 unsigned long tx_max_pending; 134 134 }; 135 135 136 - /** 136 + /* 137 137 * Representation of one iucv connection 138 138 */ 139 139 struct iucv_connection { ··· 154 154 char userdata[17]; 155 155 }; 156 156 157 - /** 157 + /* 158 158 * Linked list of all connection structs. 159 159 */ 160 160 static LIST_HEAD(iucv_connection_list); 161 161 static DEFINE_RWLOCK(iucv_connection_rwlock); 162 162 163 - /** 163 + /* 164 164 * Representation of event-data for the 165 165 * connection state machine. 166 166 */ ··· 169 169 void *data; 170 170 }; 171 171 172 - /** 172 + /* 173 173 * Private part of the network device structure 174 174 */ 175 175 struct netiucv_priv { ··· 180 180 struct device *dev; 181 181 }; 182 182 183 - /** 183 + /* 184 184 * Link level header for a packet. 185 185 */ 186 186 struct ll_header { ··· 195 195 #define NETIUCV_QUEUELEN_DEFAULT 50 196 196 #define NETIUCV_TIMEOUT_5SEC 5000 197 197 198 - /** 198 + /* 199 199 * Compatibility macros for busy handling 200 200 * of network devices. 201 201 */ ··· 223 223 0xF0, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 224 224 }; 225 225 226 - /** 226 + /* 227 227 * Convert an iucv userId to its printable 228 228 * form (strip whitespace at end). 229 229 * ··· 262 262 return netiucv_printname(conn->userid, 8); 263 263 } 264 264 265 - /** 265 + /* 266 266 * States of the interface statemachine. 267 267 */ 268 268 enum dev_states { ··· 270 270 DEV_STATE_STARTWAIT, 271 271 DEV_STATE_STOPWAIT, 272 272 DEV_STATE_RUNNING, 273 - /** 273 + /* 274 274 * MUST be always the last element!! 275 275 */ 276 276 NR_DEV_STATES ··· 283 283 "Running", 284 284 }; 285 285 286 - /** 286 + /* 287 287 * Events of the interface statemachine. 288 288 */ 289 289 enum dev_events { ··· 291 291 DEV_EVENT_STOP, 292 292 DEV_EVENT_CONUP, 293 293 DEV_EVENT_CONDOWN, 294 - /** 294 + /* 295 295 * MUST be always the last element!! 296 296 */ 297 297 NR_DEV_EVENTS ··· 304 304 "Connection down", 305 305 }; 306 306 307 - /** 307 + /* 308 308 * Events of the connection statemachine 309 309 */ 310 310 enum conn_events { 311 - /** 311 + /* 312 312 * Events, representing callbacks from 313 313 * lowlevel iucv layer) 314 314 */ ··· 320 320 CONN_EVENT_RX, 321 321 CONN_EVENT_TXDONE, 322 322 323 - /** 323 + /* 324 324 * Events, representing errors return codes from 325 325 * calls to lowlevel iucv layer 326 326 */ 327 327 328 - /** 328 + /* 329 329 * Event, representing timer expiry. 330 330 */ 331 331 CONN_EVENT_TIMER, 332 332 333 - /** 333 + /* 334 334 * Events, representing commands from upper levels. 335 335 */ 336 336 CONN_EVENT_START, 337 337 CONN_EVENT_STOP, 338 338 339 - /** 339 + /* 340 340 * MUST be always the last element!! 341 341 */ 342 342 NR_CONN_EVENTS, ··· 357 357 "Stop", 358 358 }; 359 359 360 - /** 360 + /* 361 361 * States of the connection statemachine. 362 362 */ 363 363 enum conn_states { 364 - /** 364 + /* 365 365 * Connection not assigned to any device, 366 366 * initial state, invalid 367 367 */ 368 368 CONN_STATE_INVALID, 369 369 370 - /** 370 + /* 371 371 * Userid assigned but not operating 372 372 */ 373 373 CONN_STATE_STOPPED, 374 374 375 - /** 375 + /* 376 376 * Connection registered, 377 377 * no connection request sent yet, 378 378 * no connection request received 379 379 */ 380 380 CONN_STATE_STARTWAIT, 381 381 382 - /** 382 + /* 383 383 * Connection registered and connection request sent, 384 384 * no acknowledge and no connection request received yet. 385 385 */ 386 386 CONN_STATE_SETUPWAIT, 387 387 388 - /** 388 + /* 389 389 * Connection up and running idle 390 390 */ 391 391 CONN_STATE_IDLE, 392 392 393 - /** 393 + /* 394 394 * Data sent, awaiting CONN_EVENT_TXDONE 395 395 */ 396 396 CONN_STATE_TX, 397 397 398 - /** 398 + /* 399 399 * Error during registration. 400 400 */ 401 401 CONN_STATE_REGERR, 402 402 403 - /** 403 + /* 404 404 * Error during registration. 405 405 */ 406 406 CONN_STATE_CONNERR, 407 407 408 - /** 408 + /* 409 409 * MUST be always the last element!! 410 410 */ 411 411 NR_CONN_STATES, ··· 424 424 }; 425 425 426 426 427 - /** 427 + /* 428 428 * Debug Facility Stuff 429 429 */ 430 430 static debug_info_t *iucv_dbf_setup = NULL; ··· 556 556 fsm_event(conn->fsm, CONN_EVENT_CONN_RES, conn); 557 557 } 558 558 559 - /** 559 + /* 560 560 * NOP action for statemachines 561 561 */ 562 562 static void netiucv_action_nop(fsm_instance *fi, int event, void *arg) ··· 567 567 * Actions of the connection statemachine 568 568 */ 569 569 570 - /** 570 + /* 571 571 * netiucv_unpack_skb 572 572 * @conn: The connection where this skb has been received. 573 573 * @pskb: The received skb. ··· 993 993 * Actions for interface - statemachine. 994 994 */ 995 995 996 - /** 996 + /* 997 997 * dev_action_start 998 998 * @fi: An instance of an interface statemachine. 999 999 * @event: The event, just happened. ··· 1012 1012 fsm_event(privptr->conn->fsm, CONN_EVENT_START, privptr->conn); 1013 1013 } 1014 1014 1015 - /** 1015 + /* 1016 1016 * Shutdown connection by sending CONN_EVENT_STOP to it. 1017 1017 * 1018 1018 * @param fi An instance of an interface statemachine. ··· 1034 1034 fsm_event(privptr->conn->fsm, CONN_EVENT_STOP, &ev); 1035 1035 } 1036 1036 1037 - /** 1037 + /* 1038 1038 * Called from connection statemachine 1039 1039 * when a connection is up and running. 1040 1040 * ··· 1067 1067 } 1068 1068 } 1069 1069 1070 - /** 1070 + /* 1071 1071 * Called from connection statemachine 1072 1072 * when a connection has been shutdown. 1073 1073 * ··· 1107 1107 1108 1108 static const int DEV_FSM_LEN = sizeof(dev_fsm) / sizeof(fsm_node); 1109 1109 1110 - /** 1110 + /* 1111 1111 * Transmit a packet. 1112 1112 * This is a helper function for netiucv_tx(). 1113 1113 * ··· 1144 1144 spin_unlock_irqrestore(&conn->collect_lock, saveflags); 1145 1145 } else { 1146 1146 struct sk_buff *nskb = skb; 1147 - /** 1147 + /* 1148 1148 * Copy the skb to a new allocated skb in lowmem only if the 1149 1149 * data is located above 2G in memory or tailroom is < 2. 1150 1150 */ ··· 1164 1164 } 1165 1165 copied = 1; 1166 1166 } 1167 - /** 1167 + /* 1168 1168 * skb now is below 2G and has enough room. Add headers. 1169 1169 */ 1170 1170 header.next = nskb->len + NETIUCV_HDRLEN; ··· 1194 1194 if (copied) 1195 1195 dev_kfree_skb(nskb); 1196 1196 else { 1197 - /** 1197 + /* 1198 1198 * Remove our headers. They get added 1199 1199 * again on retransmit. 1200 1200 */ ··· 1217 1217 * Interface API for upper network layers 1218 1218 */ 1219 1219 1220 - /** 1220 + /* 1221 1221 * Open an interface. 1222 1222 * Called from generic network layer when ifconfig up is run. 1223 1223 * ··· 1233 1233 return 0; 1234 1234 } 1235 1235 1236 - /** 1236 + /* 1237 1237 * Close an interface. 1238 1238 * Called from generic network layer when ifconfig down is run. 1239 1239 * ··· 1249 1249 return 0; 1250 1250 } 1251 1251 1252 - /** 1252 + /* 1253 1253 * Start transmission of a packet. 1254 1254 * Called from generic network device layer. 1255 1255 * ··· 1266 1266 int rc; 1267 1267 1268 1268 IUCV_DBF_TEXT(trace, 4, __func__); 1269 - /** 1269 + /* 1270 1270 * Some sanity checks ... 1271 1271 */ 1272 1272 if (skb == NULL) { ··· 1282 1282 return NETDEV_TX_OK; 1283 1283 } 1284 1284 1285 - /** 1285 + /* 1286 1286 * If connection is not running, try to restart it 1287 1287 * and throw away packet. 1288 1288 */ ··· 1304 1304 return rc ? NETDEV_TX_BUSY : NETDEV_TX_OK; 1305 1305 } 1306 1306 1307 - /** 1307 + /* 1308 1308 * netiucv_stats 1309 1309 * @dev: Pointer to interface struct. 1310 1310 * ··· 1745 1745 device_unregister(dev); 1746 1746 } 1747 1747 1748 - /** 1748 + /* 1749 1749 * Allocate and initialize a new connection structure. 1750 1750 * Add it to the list of netiucv connections; 1751 1751 */ ··· 1802 1802 return NULL; 1803 1803 } 1804 1804 1805 - /** 1805 + /* 1806 1806 * Release a connection structure and remove it from the 1807 1807 * list of netiucv connections. 1808 1808 */ ··· 1826 1826 kfree_skb(conn->tx_buff); 1827 1827 } 1828 1828 1829 - /** 1829 + /* 1830 1830 * Release everything of a net device. 1831 1831 */ 1832 1832 static void netiucv_free_netdevice(struct net_device *dev) ··· 1848 1848 } 1849 1849 } 1850 1850 1851 - /** 1851 + /* 1852 1852 * Initialize a net device. (Called from kernel in alloc_netdev()) 1853 1853 */ 1854 1854 static const struct net_device_ops netiucv_netdev_ops = { ··· 1873 1873 dev->netdev_ops = &netiucv_netdev_ops; 1874 1874 } 1875 1875 1876 - /** 1876 + /* 1877 1877 * Allocate and initialize everything of a net device. 1878 1878 */ 1879 1879 static struct net_device *netiucv_init_netdevice(char *username, char *userdata)