diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:58:38 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-26 21:58:38 -0400 |
commit | e82b0f2cc21be905e504573483fa9542b15df96f (patch) | |
tree | 241f31052917235824197fc755289f4c9ee7779b | |
parent | 74ef872c8f250acc02add54ff9d96f31d17bfeb3 (diff) |
[netdrvr s/390] trim trailing whitespace
Previous fix patches added a bunch of trailing whitespace,
which git-applymbox complained loudly about.
-rw-r--r-- | drivers/s390/net/ctcmain.c | 26 | ||||
-rw-r--r-- | drivers/s390/net/ctctty.c | 10 | ||||
-rw-r--r-- | drivers/s390/net/cu3088.c | 8 | ||||
-rw-r--r-- | drivers/s390/net/iucv.c | 36 | ||||
-rw-r--r-- | drivers/s390/net/iucv.h | 622 | ||||
-rw-r--r-- | drivers/s390/net/lcs.c | 10 | ||||
-rw-r--r-- | drivers/s390/net/netiucv.c | 36 | ||||
-rw-r--r-- | drivers/s390/net/qeth.h | 16 | ||||
-rw-r--r-- | drivers/s390/net/qeth_eddp.c | 18 | ||||
-rw-r--r-- | drivers/s390/net/qeth_fs.h | 2 | ||||
-rw-r--r-- | drivers/s390/net/qeth_main.c | 74 | ||||
-rw-r--r-- | drivers/s390/net/qeth_mpc.h | 4 | ||||
-rw-r--r-- | drivers/s390/net/qeth_proc.c | 8 | ||||
-rw-r--r-- | drivers/s390/net/qeth_sys.c | 6 | ||||
-rw-r--r-- | drivers/s390/net/qeth_tso.h | 4 |
15 files changed, 440 insertions, 440 deletions
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c index af9f212314b3..fe986af884f8 100644 --- a/drivers/s390/net/ctcmain.c +++ b/drivers/s390/net/ctcmain.c | |||
@@ -1486,13 +1486,13 @@ ch_action_iofatal(fsm_instance * fi, int event, void *arg) | |||
1486 | } | 1486 | } |
1487 | } | 1487 | } |
1488 | 1488 | ||
1489 | static void | 1489 | static void |
1490 | ch_action_reinit(fsm_instance *fi, int event, void *arg) | 1490 | ch_action_reinit(fsm_instance *fi, int event, void *arg) |
1491 | { | 1491 | { |
1492 | struct channel *ch = (struct channel *)arg; | 1492 | struct channel *ch = (struct channel *)arg; |
1493 | struct net_device *dev = ch->netdev; | 1493 | struct net_device *dev = ch->netdev; |
1494 | struct ctc_priv *privptr = dev->priv; | 1494 | struct ctc_priv *privptr = dev->priv; |
1495 | 1495 | ||
1496 | DBF_TEXT(trace, 4, __FUNCTION__); | 1496 | DBF_TEXT(trace, 4, __FUNCTION__); |
1497 | ch_action_iofatal(fi, event, arg); | 1497 | ch_action_iofatal(fi, event, arg); |
1498 | fsm_addtimer(&privptr->restart_timer, 1000, DEV_EVENT_RESTART, dev); | 1498 | fsm_addtimer(&privptr->restart_timer, 1000, DEV_EVENT_RESTART, dev); |
@@ -1624,7 +1624,7 @@ less_than(char *id1, char *id2) | |||
1624 | } | 1624 | } |
1625 | dev1 = simple_strtoul(id1, &id1, 16); | 1625 | dev1 = simple_strtoul(id1, &id1, 16); |
1626 | dev2 = simple_strtoul(id2, &id2, 16); | 1626 | dev2 = simple_strtoul(id2, &id2, 16); |
1627 | 1627 | ||
1628 | return (dev1 < dev2); | 1628 | return (dev1 < dev2); |
1629 | } | 1629 | } |
1630 | 1630 | ||
@@ -1895,7 +1895,7 @@ ctc_irq_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1895 | irb->scsw.dstat); | 1895 | irb->scsw.dstat); |
1896 | return; | 1896 | return; |
1897 | } | 1897 | } |
1898 | 1898 | ||
1899 | priv = ((struct ccwgroup_device *)cdev->dev.driver_data) | 1899 | priv = ((struct ccwgroup_device *)cdev->dev.driver_data) |
1900 | ->dev.driver_data; | 1900 | ->dev.driver_data; |
1901 | 1901 | ||
@@ -1909,7 +1909,7 @@ ctc_irq_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1909 | "device %s\n", cdev->dev.bus_id); | 1909 | "device %s\n", cdev->dev.bus_id); |
1910 | return; | 1910 | return; |
1911 | } | 1911 | } |
1912 | 1912 | ||
1913 | dev = (struct net_device *) (ch->netdev); | 1913 | dev = (struct net_device *) (ch->netdev); |
1914 | if (dev == NULL) { | 1914 | if (dev == NULL) { |
1915 | ctc_pr_crit("ctc: ctc_irq_handler dev=NULL bus_id=%s, ch=0x%p\n", | 1915 | ctc_pr_crit("ctc: ctc_irq_handler dev=NULL bus_id=%s, ch=0x%p\n", |
@@ -2008,12 +2008,12 @@ dev_action_stop(fsm_instance * fi, int event, void *arg) | |||
2008 | fsm_event(ch->fsm, CH_EVENT_STOP, ch); | 2008 | fsm_event(ch->fsm, CH_EVENT_STOP, ch); |
2009 | } | 2009 | } |
2010 | } | 2010 | } |
2011 | static void | 2011 | static void |
2012 | dev_action_restart(fsm_instance *fi, int event, void *arg) | 2012 | dev_action_restart(fsm_instance *fi, int event, void *arg) |
2013 | { | 2013 | { |
2014 | struct net_device *dev = (struct net_device *)arg; | 2014 | struct net_device *dev = (struct net_device *)arg; |
2015 | struct ctc_priv *privptr = dev->priv; | 2015 | struct ctc_priv *privptr = dev->priv; |
2016 | 2016 | ||
2017 | DBF_TEXT(trace, 3, __FUNCTION__); | 2017 | DBF_TEXT(trace, 3, __FUNCTION__); |
2018 | ctc_pr_debug("%s: Restarting\n", dev->name); | 2018 | ctc_pr_debug("%s: Restarting\n", dev->name); |
2019 | dev_action_stop(fi, event, arg); | 2019 | dev_action_stop(fi, event, arg); |
@@ -2193,7 +2193,7 @@ transmit_skb(struct channel *ch, struct sk_buff *skb) | |||
2193 | 2193 | ||
2194 | DBF_TEXT(trace, 5, __FUNCTION__); | 2194 | DBF_TEXT(trace, 5, __FUNCTION__); |
2195 | /* we need to acquire the lock for testing the state | 2195 | /* we need to acquire the lock for testing the state |
2196 | * otherwise we can have an IRQ changing the state to | 2196 | * otherwise we can have an IRQ changing the state to |
2197 | * TXIDLE after the test but before acquiring the lock. | 2197 | * TXIDLE after the test but before acquiring the lock. |
2198 | */ | 2198 | */ |
2199 | spin_lock_irqsave(&ch->collect_lock, saveflags); | 2199 | spin_lock_irqsave(&ch->collect_lock, saveflags); |
@@ -2393,7 +2393,7 @@ ctc_tx(struct sk_buff *skb, struct net_device * dev) | |||
2393 | 2393 | ||
2394 | /** | 2394 | /** |
2395 | * If channels are not running, try to restart them | 2395 | * If channels are not running, try to restart them |
2396 | * and throw away packet. | 2396 | * and throw away packet. |
2397 | */ | 2397 | */ |
2398 | if (fsm_getstate(privptr->fsm) != DEV_STATE_RUNNING) { | 2398 | if (fsm_getstate(privptr->fsm) != DEV_STATE_RUNNING) { |
2399 | fsm_event(privptr->fsm, DEV_EVENT_START, dev); | 2399 | fsm_event(privptr->fsm, DEV_EVENT_START, dev); |
@@ -2738,7 +2738,7 @@ ctc_remove_files(struct device *dev) | |||
2738 | /** | 2738 | /** |
2739 | * Add ctc specific attributes. | 2739 | * Add ctc specific attributes. |
2740 | * Add ctc private data. | 2740 | * Add ctc private data. |
2741 | * | 2741 | * |
2742 | * @param cgdev pointer to ccwgroup_device just added | 2742 | * @param cgdev pointer to ccwgroup_device just added |
2743 | * | 2743 | * |
2744 | * @returns 0 on success, !0 on failure. | 2744 | * @returns 0 on success, !0 on failure. |
@@ -2869,7 +2869,7 @@ ctc_new_device(struct ccwgroup_device *cgdev) | |||
2869 | DBF_TEXT(setup, 3, buffer); | 2869 | DBF_TEXT(setup, 3, buffer); |
2870 | 2870 | ||
2871 | type = get_channel_type(&cgdev->cdev[0]->id); | 2871 | type = get_channel_type(&cgdev->cdev[0]->id); |
2872 | 2872 | ||
2873 | snprintf(read_id, CTC_ID_SIZE, "ch-%s", cgdev->cdev[0]->dev.bus_id); | 2873 | snprintf(read_id, CTC_ID_SIZE, "ch-%s", cgdev->cdev[0]->dev.bus_id); |
2874 | snprintf(write_id, CTC_ID_SIZE, "ch-%s", cgdev->cdev[1]->dev.bus_id); | 2874 | snprintf(write_id, CTC_ID_SIZE, "ch-%s", cgdev->cdev[1]->dev.bus_id); |
2875 | 2875 | ||
@@ -2907,7 +2907,7 @@ ctc_new_device(struct ccwgroup_device *cgdev) | |||
2907 | channel_get(type, direction == READ ? read_id : write_id, | 2907 | channel_get(type, direction == READ ? read_id : write_id, |
2908 | direction); | 2908 | direction); |
2909 | if (privptr->channel[direction] == NULL) { | 2909 | if (privptr->channel[direction] == NULL) { |
2910 | if (direction == WRITE) | 2910 | if (direction == WRITE) |
2911 | channel_free(privptr->channel[READ]); | 2911 | channel_free(privptr->channel[READ]); |
2912 | 2912 | ||
2913 | ctc_free_netdevice(dev, 1); | 2913 | ctc_free_netdevice(dev, 1); |
@@ -2955,7 +2955,7 @@ ctc_shutdown_device(struct ccwgroup_device *cgdev) | |||
2955 | { | 2955 | { |
2956 | struct ctc_priv *priv; | 2956 | struct ctc_priv *priv; |
2957 | struct net_device *ndev; | 2957 | struct net_device *ndev; |
2958 | 2958 | ||
2959 | DBF_TEXT(setup, 3, __FUNCTION__); | 2959 | DBF_TEXT(setup, 3, __FUNCTION__); |
2960 | pr_debug("%s() called\n", __FUNCTION__); | 2960 | pr_debug("%s() called\n", __FUNCTION__); |
2961 | 2961 | ||
diff --git a/drivers/s390/net/ctctty.c b/drivers/s390/net/ctctty.c index 5cdcdbf92962..af54d1de07bf 100644 --- a/drivers/s390/net/ctctty.c +++ b/drivers/s390/net/ctctty.c | |||
@@ -130,7 +130,7 @@ ctc_tty_readmodem(ctc_tty_info *info) | |||
130 | if ((tty = info->tty)) { | 130 | if ((tty = info->tty)) { |
131 | if (info->mcr & UART_MCR_RTS) { | 131 | if (info->mcr & UART_MCR_RTS) { |
132 | struct sk_buff *skb; | 132 | struct sk_buff *skb; |
133 | 133 | ||
134 | if ((skb = skb_dequeue(&info->rx_queue))) { | 134 | if ((skb = skb_dequeue(&info->rx_queue))) { |
135 | int len = skb->len; | 135 | int len = skb->len; |
136 | tty_insert_flip_string(tty, skb->data, len); | 136 | tty_insert_flip_string(tty, skb->data, len); |
@@ -328,7 +328,7 @@ ctc_tty_inject(ctc_tty_info *info, char c) | |||
328 | { | 328 | { |
329 | int skb_res; | 329 | int skb_res; |
330 | struct sk_buff *skb; | 330 | struct sk_buff *skb; |
331 | 331 | ||
332 | DBF_TEXT(trace, 4, __FUNCTION__); | 332 | DBF_TEXT(trace, 4, __FUNCTION__); |
333 | if (ctc_tty_shuttingdown) | 333 | if (ctc_tty_shuttingdown) |
334 | return; | 334 | return; |
@@ -497,7 +497,7 @@ ctc_tty_write(struct tty_struct *tty, const u_char * buf, int count) | |||
497 | c = (count < CTC_TTY_XMIT_SIZE) ? count : CTC_TTY_XMIT_SIZE; | 497 | c = (count < CTC_TTY_XMIT_SIZE) ? count : CTC_TTY_XMIT_SIZE; |
498 | if (c <= 0) | 498 | if (c <= 0) |
499 | break; | 499 | break; |
500 | 500 | ||
501 | skb_res = info->netdev->hard_header_len + sizeof(info->mcr) + | 501 | skb_res = info->netdev->hard_header_len + sizeof(info->mcr) + |
502 | + sizeof(__u32); | 502 | + sizeof(__u32); |
503 | skb = dev_alloc_skb(skb_res + c); | 503 | skb = dev_alloc_skb(skb_res + c); |
@@ -828,7 +828,7 @@ ctc_tty_block_til_ready(struct tty_struct *tty, struct file *filp, ctc_tty_info | |||
828 | if (tty_hung_up_p(filp) || | 828 | if (tty_hung_up_p(filp) || |
829 | (info->flags & CTC_ASYNC_CLOSING)) { | 829 | (info->flags & CTC_ASYNC_CLOSING)) { |
830 | if (info->flags & CTC_ASYNC_CLOSING) | 830 | if (info->flags & CTC_ASYNC_CLOSING) |
831 | wait_event(info->close_wait, | 831 | wait_event(info->close_wait, |
832 | !(info->flags & CTC_ASYNC_CLOSING)); | 832 | !(info->flags & CTC_ASYNC_CLOSING)); |
833 | #ifdef MODEM_DO_RESTART | 833 | #ifdef MODEM_DO_RESTART |
834 | if (info->flags & CTC_ASYNC_HUP_NOTIFY) | 834 | if (info->flags & CTC_ASYNC_HUP_NOTIFY) |
@@ -1247,7 +1247,7 @@ ctc_tty_unregister_netdev(struct net_device *dev) { | |||
1247 | void | 1247 | void |
1248 | ctc_tty_cleanup(void) { | 1248 | ctc_tty_cleanup(void) { |
1249 | unsigned long saveflags; | 1249 | unsigned long saveflags; |
1250 | 1250 | ||
1251 | DBF_TEXT(trace, 2, __FUNCTION__); | 1251 | DBF_TEXT(trace, 2, __FUNCTION__); |
1252 | spin_lock_irqsave(&ctc_tty_lock, saveflags); | 1252 | spin_lock_irqsave(&ctc_tty_lock, saveflags); |
1253 | ctc_tty_shuttingdown = 1; | 1253 | ctc_tty_shuttingdown = 1; |
diff --git a/drivers/s390/net/cu3088.c b/drivers/s390/net/cu3088.c index e1b8c9a9634f..e965f03a7291 100644 --- a/drivers/s390/net/cu3088.c +++ b/drivers/s390/net/cu3088.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | * | 21 | * |
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
@@ -94,7 +94,7 @@ static DRIVER_ATTR(group, 0200, NULL, group_write); | |||
94 | 94 | ||
95 | /* Register-unregister for ctc&lcs */ | 95 | /* Register-unregister for ctc&lcs */ |
96 | int | 96 | int |
97 | register_cu3088_discipline(struct ccwgroup_driver *dcp) | 97 | register_cu3088_discipline(struct ccwgroup_driver *dcp) |
98 | { | 98 | { |
99 | int rc; | 99 | int rc; |
100 | 100 | ||
@@ -109,7 +109,7 @@ register_cu3088_discipline(struct ccwgroup_driver *dcp) | |||
109 | rc = driver_create_file(&dcp->driver, &driver_attr_group); | 109 | rc = driver_create_file(&dcp->driver, &driver_attr_group); |
110 | if (rc) | 110 | if (rc) |
111 | ccwgroup_driver_unregister(dcp); | 111 | ccwgroup_driver_unregister(dcp); |
112 | 112 | ||
113 | return rc; | 113 | return rc; |
114 | 114 | ||
115 | } | 115 | } |
@@ -137,7 +137,7 @@ static int __init | |||
137 | cu3088_init (void) | 137 | cu3088_init (void) |
138 | { | 138 | { |
139 | int rc; | 139 | int rc; |
140 | 140 | ||
141 | cu3088_root_dev = s390_root_dev_register("cu3088"); | 141 | cu3088_root_dev = s390_root_dev_register("cu3088"); |
142 | if (IS_ERR(cu3088_root_dev)) | 142 | if (IS_ERR(cu3088_root_dev)) |
143 | return PTR_ERR(cu3088_root_dev); | 143 | return PTR_ERR(cu3088_root_dev); |
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c index 6190be9dca99..e0c7deb98831 100644 --- a/drivers/s390/net/iucv.c +++ b/drivers/s390/net/iucv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * IUCV network driver | 2 | * IUCV network driver |
3 | * | 3 | * |
4 | * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation | 4 | * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation |
@@ -28,7 +28,7 @@ | |||
28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
29 | * | 29 | * |
30 | */ | 30 | */ |
31 | 31 | ||
32 | /* #define DEBUG */ | 32 | /* #define DEBUG */ |
33 | 33 | ||
34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
@@ -81,7 +81,7 @@ iucv_bus_match (struct device *dev, struct device_driver *drv) | |||
81 | struct bus_type iucv_bus = { | 81 | struct bus_type iucv_bus = { |
82 | .name = "iucv", | 82 | .name = "iucv", |
83 | .match = iucv_bus_match, | 83 | .match = iucv_bus_match, |
84 | }; | 84 | }; |
85 | 85 | ||
86 | struct device *iucv_root; | 86 | struct device *iucv_root; |
87 | 87 | ||
@@ -297,7 +297,7 @@ MODULE_LICENSE("GPL"); | |||
297 | /* | 297 | /* |
298 | * Debugging stuff | 298 | * Debugging stuff |
299 | *******************************************************************************/ | 299 | *******************************************************************************/ |
300 | 300 | ||
301 | 301 | ||
302 | #ifdef DEBUG | 302 | #ifdef DEBUG |
303 | static int debuglevel = 0; | 303 | static int debuglevel = 0; |
@@ -344,7 +344,7 @@ do { \ | |||
344 | /* | 344 | /* |
345 | * Internal functions | 345 | * Internal functions |
346 | *******************************************************************************/ | 346 | *******************************************************************************/ |
347 | 347 | ||
348 | /** | 348 | /** |
349 | * print start banner | 349 | * print start banner |
350 | */ | 350 | */ |
@@ -810,7 +810,7 @@ iucv_register_program (__u8 pgmname[16], | |||
810 | sizeof (new_handler->id.userid)); | 810 | sizeof (new_handler->id.userid)); |
811 | EBC_TOUPPER (new_handler->id.userid, | 811 | EBC_TOUPPER (new_handler->id.userid, |
812 | sizeof (new_handler->id.userid)); | 812 | sizeof (new_handler->id.userid)); |
813 | 813 | ||
814 | if (pgmmask) { | 814 | if (pgmmask) { |
815 | memcpy (new_handler->id.mask, pgmmask, | 815 | memcpy (new_handler->id.mask, pgmmask, |
816 | sizeof (new_handler->id.mask)); | 816 | sizeof (new_handler->id.mask)); |
@@ -1229,7 +1229,7 @@ iucv_purge (__u16 pathid, __u32 msgid, __u32 srccls, __u32 *audit) | |||
1229 | /* parm->ipaudit has only 3 bytes */ | 1229 | /* parm->ipaudit has only 3 bytes */ |
1230 | *audit >>= 8; | 1230 | *audit >>= 8; |
1231 | } | 1231 | } |
1232 | 1232 | ||
1233 | release_param(parm); | 1233 | release_param(parm); |
1234 | 1234 | ||
1235 | iucv_debug(1, "b2f0_result = %ld", b2f0_result); | 1235 | iucv_debug(1, "b2f0_result = %ld", b2f0_result); |
@@ -2330,14 +2330,14 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2330 | temp_buff1[j] &= (h->id.mask)[j]; | 2330 | temp_buff1[j] &= (h->id.mask)[j]; |
2331 | temp_buff2[j] &= (h->id.mask)[j]; | 2331 | temp_buff2[j] &= (h->id.mask)[j]; |
2332 | } | 2332 | } |
2333 | 2333 | ||
2334 | iucv_dumpit("temp_buff1:", | 2334 | iucv_dumpit("temp_buff1:", |
2335 | temp_buff1, sizeof(temp_buff1)); | 2335 | temp_buff1, sizeof(temp_buff1)); |
2336 | iucv_dumpit("temp_buff2", | 2336 | iucv_dumpit("temp_buff2", |
2337 | temp_buff2, sizeof(temp_buff2)); | 2337 | temp_buff2, sizeof(temp_buff2)); |
2338 | 2338 | ||
2339 | if (!memcmp (temp_buff1, temp_buff2, 24)) { | 2339 | if (!memcmp (temp_buff1, temp_buff2, 24)) { |
2340 | 2340 | ||
2341 | iucv_debug(2, | 2341 | iucv_debug(2, |
2342 | "found a matching handler"); | 2342 | "found a matching handler"); |
2343 | break; | 2343 | break; |
@@ -2368,7 +2368,7 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2368 | } else | 2368 | } else |
2369 | iucv_sever(int_buf->ippathid, no_listener); | 2369 | iucv_sever(int_buf->ippathid, no_listener); |
2370 | break; | 2370 | break; |
2371 | 2371 | ||
2372 | case 0x02: /*connection complete */ | 2372 | case 0x02: /*connection complete */ |
2373 | if (messagesDisabled) { | 2373 | if (messagesDisabled) { |
2374 | iucv_setmask(~0); | 2374 | iucv_setmask(~0); |
@@ -2387,7 +2387,7 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2387 | } else | 2387 | } else |
2388 | iucv_sever(int_buf->ippathid, no_listener); | 2388 | iucv_sever(int_buf->ippathid, no_listener); |
2389 | break; | 2389 | break; |
2390 | 2390 | ||
2391 | case 0x03: /* connection severed */ | 2391 | case 0x03: /* connection severed */ |
2392 | if (messagesDisabled) { | 2392 | if (messagesDisabled) { |
2393 | iucv_setmask(~0); | 2393 | iucv_setmask(~0); |
@@ -2398,13 +2398,13 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2398 | interrupt->ConnectionSevered( | 2398 | interrupt->ConnectionSevered( |
2399 | (iucv_ConnectionSevered *)int_buf, | 2399 | (iucv_ConnectionSevered *)int_buf, |
2400 | h->pgm_data); | 2400 | h->pgm_data); |
2401 | 2401 | ||
2402 | else | 2402 | else |
2403 | iucv_sever (int_buf->ippathid, no_listener); | 2403 | iucv_sever (int_buf->ippathid, no_listener); |
2404 | } else | 2404 | } else |
2405 | iucv_sever(int_buf->ippathid, no_listener); | 2405 | iucv_sever(int_buf->ippathid, no_listener); |
2406 | break; | 2406 | break; |
2407 | 2407 | ||
2408 | case 0x04: /* connection quiesced */ | 2408 | case 0x04: /* connection quiesced */ |
2409 | if (messagesDisabled) { | 2409 | if (messagesDisabled) { |
2410 | iucv_setmask(~0); | 2410 | iucv_setmask(~0); |
@@ -2420,7 +2420,7 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2420 | "ConnectionQuiesced not called"); | 2420 | "ConnectionQuiesced not called"); |
2421 | } | 2421 | } |
2422 | break; | 2422 | break; |
2423 | 2423 | ||
2424 | case 0x05: /* connection resumed */ | 2424 | case 0x05: /* connection resumed */ |
2425 | if (messagesDisabled) { | 2425 | if (messagesDisabled) { |
2426 | iucv_setmask(~0); | 2426 | iucv_setmask(~0); |
@@ -2436,7 +2436,7 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2436 | "ConnectionResumed not called"); | 2436 | "ConnectionResumed not called"); |
2437 | } | 2437 | } |
2438 | break; | 2438 | break; |
2439 | 2439 | ||
2440 | case 0x06: /* priority message complete */ | 2440 | case 0x06: /* priority message complete */ |
2441 | case 0x07: /* nonpriority message complete */ | 2441 | case 0x07: /* nonpriority message complete */ |
2442 | if (h) { | 2442 | if (h) { |
@@ -2449,7 +2449,7 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2449 | "MessageComplete not called"); | 2449 | "MessageComplete not called"); |
2450 | } | 2450 | } |
2451 | break; | 2451 | break; |
2452 | 2452 | ||
2453 | case 0x08: /* priority message pending */ | 2453 | case 0x08: /* priority message pending */ |
2454 | case 0x09: /* nonpriority message pending */ | 2454 | case 0x09: /* nonpriority message pending */ |
2455 | if (h) { | 2455 | if (h) { |
@@ -2467,7 +2467,7 @@ iucv_do_int(iucv_GeneralInterrupt * int_buf) | |||
2467 | __FUNCTION__); | 2467 | __FUNCTION__); |
2468 | break; | 2468 | break; |
2469 | } /* end switch */ | 2469 | } /* end switch */ |
2470 | 2470 | ||
2471 | iucv_debug(2, "exiting pathid %d, type %02X", | 2471 | iucv_debug(2, "exiting pathid %d, type %02X", |
2472 | int_buf->ippathid, int_buf->iptype); | 2472 | int_buf->ippathid, int_buf->iptype); |
2473 | 2473 | ||
diff --git a/drivers/s390/net/iucv.h b/drivers/s390/net/iucv.h index 0c4644d3d2f3..5b6b1b7241c9 100644 --- a/drivers/s390/net/iucv.h +++ b/drivers/s390/net/iucv.h | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * S390 version | 5 | * S390 version |
6 | * Copyright (C) 2000 IBM Corporation | 6 | * Copyright (C) 2000 IBM Corporation |
7 | * Author(s):Alan Altmark (Alan_Altmark@us.ibm.com) | 7 | * Author(s):Alan Altmark (Alan_Altmark@us.ibm.com) |
8 | * Xenia Tkatschow (xenia@us.ibm.com) | 8 | * Xenia Tkatschow (xenia@us.ibm.com) |
9 | * | 9 | * |
10 | * | 10 | * |
@@ -16,17 +16,17 @@ | |||
16 | * CP Programming Services book, also available on the web | 16 | * CP Programming Services book, also available on the web |
17 | * thru www.ibm.com/s390/vm/pubs, manual # SC24-5760 | 17 | * thru www.ibm.com/s390/vm/pubs, manual # SC24-5760 |
18 | * | 18 | * |
19 | * Definition of Return Codes | 19 | * Definition of Return Codes |
20 | * -All positive return codes including zero are reflected back | 20 | * -All positive return codes including zero are reflected back |
21 | * from CP except for iucv_register_program. The definition of each | 21 | * from CP except for iucv_register_program. The definition of each |
22 | * return code can be found in CP Programming Services book. | 22 | * return code can be found in CP Programming Services book. |
23 | * Also available on the web thru www.ibm.com/s390/vm/pubs, manual # SC24-5760 | 23 | * Also available on the web thru www.ibm.com/s390/vm/pubs, manual # SC24-5760 |
24 | * - Return Code of: | 24 | * - Return Code of: |
25 | * (-EINVAL) Invalid value | 25 | * (-EINVAL) Invalid value |
26 | * (-ENOMEM) storage allocation failed | 26 | * (-ENOMEM) storage allocation failed |
27 | * pgmask defined in iucv_register_program will be set depending on input | 27 | * pgmask defined in iucv_register_program will be set depending on input |
28 | * paramters. | 28 | * paramters. |
29 | * | 29 | * |
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
@@ -124,13 +124,13 @@ iucv_hex_dump(unsigned char *buf, size_t len) | |||
124 | #define iucv_handle_t void * | 124 | #define iucv_handle_t void * |
125 | 125 | ||
126 | /* flags1: | 126 | /* flags1: |
127 | * All flags are defined in the field IPFLAGS1 of each function | 127 | * All flags are defined in the field IPFLAGS1 of each function |
128 | * and can be found in CP Programming Services. | 128 | * and can be found in CP Programming Services. |
129 | * IPLOCAL - Indicates the connect can only be satisfied on the | 129 | * IPLOCAL - Indicates the connect can only be satisfied on the |
130 | * local system | 130 | * local system |
131 | * IPPRTY - Indicates a priority message | 131 | * IPPRTY - Indicates a priority message |
132 | * IPQUSCE - Indicates you do not want to receive messages on a | 132 | * IPQUSCE - Indicates you do not want to receive messages on a |
133 | * path until an iucv_resume is issued | 133 | * path until an iucv_resume is issued |
134 | * IPRMDATA - Indicates that the message is in the parameter list | 134 | * IPRMDATA - Indicates that the message is in the parameter list |
135 | */ | 135 | */ |
136 | #define IPLOCAL 0x01 | 136 | #define IPLOCAL 0x01 |
@@ -154,14 +154,14 @@ iucv_hex_dump(unsigned char *buf, size_t len) | |||
154 | #define AllInterrupts 0xf8 | 154 | #define AllInterrupts 0xf8 |
155 | /* | 155 | /* |
156 | * Mapping of external interrupt buffers should be used with the corresponding | 156 | * Mapping of external interrupt buffers should be used with the corresponding |
157 | * interrupt types. | 157 | * interrupt types. |
158 | * Names: iucv_ConnectionPending -> connection pending | 158 | * Names: iucv_ConnectionPending -> connection pending |
159 | * iucv_ConnectionComplete -> connection complete | 159 | * iucv_ConnectionComplete -> connection complete |
160 | * iucv_ConnectionSevered -> connection severed | 160 | * iucv_ConnectionSevered -> connection severed |
161 | * iucv_ConnectionQuiesced -> connection quiesced | 161 | * iucv_ConnectionQuiesced -> connection quiesced |
162 | * iucv_ConnectionResumed -> connection resumed | 162 | * iucv_ConnectionResumed -> connection resumed |
163 | * iucv_MessagePending -> message pending | 163 | * iucv_MessagePending -> message pending |
164 | * iucv_MessageComplete -> message complete | 164 | * iucv_MessageComplete -> message complete |
165 | */ | 165 | */ |
166 | typedef struct { | 166 | typedef struct { |
167 | u16 ippathid; | 167 | u16 ippathid; |
@@ -260,16 +260,16 @@ typedef struct { | |||
260 | uchar res2[3]; | 260 | uchar res2[3]; |
261 | } iucv_MessageComplete; | 261 | } iucv_MessageComplete; |
262 | 262 | ||
263 | /* | 263 | /* |
264 | * iucv_interrupt_ops_t: Is a vector of functions that handle | 264 | * iucv_interrupt_ops_t: Is a vector of functions that handle |
265 | * IUCV interrupts. | 265 | * IUCV interrupts. |
266 | * Parameter list: | 266 | * Parameter list: |
267 | * eib - is a pointer to a 40-byte area described | 267 | * eib - is a pointer to a 40-byte area described |
268 | * with one of the structures above. | 268 | * with one of the structures above. |
269 | * pgm_data - this data is strictly for the | 269 | * pgm_data - this data is strictly for the |
270 | * interrupt handler that is passed by | 270 | * interrupt handler that is passed by |
271 | * the application. This may be an address | 271 | * the application. This may be an address |
272 | * or token. | 272 | * or token. |
273 | */ | 273 | */ |
274 | typedef struct { | 274 | typedef struct { |
275 | void (*ConnectionPending) (iucv_ConnectionPending * eib, | 275 | void (*ConnectionPending) (iucv_ConnectionPending * eib, |
@@ -287,8 +287,8 @@ typedef struct { | |||
287 | } iucv_interrupt_ops_t; | 287 | } iucv_interrupt_ops_t; |
288 | 288 | ||
289 | /* | 289 | /* |
290 | *iucv_array_t : Defines buffer array. | 290 | *iucv_array_t : Defines buffer array. |
291 | * Inside the array may be 31- bit addresses and 31-bit lengths. | 291 | * Inside the array may be 31- bit addresses and 31-bit lengths. |
292 | */ | 292 | */ |
293 | typedef struct { | 293 | typedef struct { |
294 | u32 address; | 294 | u32 address; |
@@ -299,19 +299,19 @@ extern struct bus_type iucv_bus; | |||
299 | extern struct device *iucv_root; | 299 | extern struct device *iucv_root; |
300 | 300 | ||
301 | /* -prototypes- */ | 301 | /* -prototypes- */ |
302 | /* | 302 | /* |
303 | * Name: iucv_register_program | 303 | * Name: iucv_register_program |
304 | * Purpose: Registers an application with IUCV | 304 | * Purpose: Registers an application with IUCV |
305 | * Input: prmname - user identification | 305 | * Input: prmname - user identification |
306 | * userid - machine identification | 306 | * userid - machine identification |
307 | * pgmmask - indicates which bits in the prmname and userid combined will be | 307 | * pgmmask - indicates which bits in the prmname and userid combined will be |
308 | * used to determine who is given control | 308 | * used to determine who is given control |
309 | * ops - address of vector of interrupt handlers | 309 | * ops - address of vector of interrupt handlers |
310 | * pgm_data- application data passed to interrupt handlers | 310 | * pgm_data- application data passed to interrupt handlers |
311 | * Output: NA | 311 | * Output: NA |
312 | * Return: address of handler | 312 | * Return: address of handler |
313 | * (0) - Error occurred, registration not completed. | 313 | * (0) - Error occurred, registration not completed. |
314 | * NOTE: Exact cause of failure will be recorded in syslog. | 314 | * NOTE: Exact cause of failure will be recorded in syslog. |
315 | */ | 315 | */ |
316 | iucv_handle_t iucv_register_program (uchar pgmname[16], | 316 | iucv_handle_t iucv_register_program (uchar pgmname[16], |
317 | uchar userid[8], | 317 | uchar userid[8], |
@@ -319,13 +319,13 @@ iucv_handle_t iucv_register_program (uchar pgmname[16], | |||
319 | iucv_interrupt_ops_t * ops, | 319 | iucv_interrupt_ops_t * ops, |
320 | void *pgm_data); | 320 | void *pgm_data); |
321 | 321 | ||
322 | /* | 322 | /* |
323 | * Name: iucv_unregister_program | 323 | * Name: iucv_unregister_program |
324 | * Purpose: Unregister application with IUCV | 324 | * Purpose: Unregister application with IUCV |
325 | * Input: address of handler | 325 | * Input: address of handler |
326 | * Output: NA | 326 | * Output: NA |
327 | * Return: (0) - Normal return | 327 | * Return: (0) - Normal return |
328 | * (-EINVAL) - Internal error, wild pointer | 328 | * (-EINVAL) - Internal error, wild pointer |
329 | */ | 329 | */ |
330 | int iucv_unregister_program (iucv_handle_t handle); | 330 | int iucv_unregister_program (iucv_handle_t handle); |
331 | 331 | ||
@@ -333,7 +333,7 @@ int iucv_unregister_program (iucv_handle_t handle); | |||
333 | * Name: iucv_accept | 333 | * Name: iucv_accept |
334 | * Purpose: This function is issued after the user receives a Connection Pending external | 334 | * Purpose: This function is issued after the user receives a Connection Pending external |
335 | * interrupt and now wishes to complete the IUCV communication path. | 335 | * interrupt and now wishes to complete the IUCV communication path. |
336 | * Input: pathid - u16 , Path identification number | 336 | * Input: pathid - u16 , Path identification number |
337 | * msglim_reqstd - u16, The number of outstanding messages requested. | 337 | * msglim_reqstd - u16, The number of outstanding messages requested. |
338 | * user_data - uchar[16], Data specified by the iucv_connect function. | 338 | * user_data - uchar[16], Data specified by the iucv_connect function. |
339 | * flags1 - int, Contains options for this path. | 339 | * flags1 - int, Contains options for this path. |
@@ -358,34 +358,34 @@ int iucv_accept (u16 pathid, | |||
358 | void *pgm_data, int *flags1_out, u16 * msglim); | 358 | void *pgm_data, int *flags1_out, u16 * msglim); |
359 | 359 | ||
360 | /* | 360 | /* |
361 | * Name: iucv_connect | 361 | * Name: iucv_connect |
362 | * Purpose: This function establishes an IUCV path. Although the connect may complete | 362 | * Purpose: This function establishes an IUCV path. Although the connect may complete |
363 | * successfully, you are not able to use the path until you receive an IUCV | 363 | * successfully, you are not able to use the path until you receive an IUCV |
364 | * Connection Complete external interrupt. | 364 | * Connection Complete external interrupt. |
365 | * Input: pathid - u16 *, Path identification number | 365 | * Input: pathid - u16 *, Path identification number |
366 | * msglim_reqstd - u16, Number of outstanding messages requested | 366 | * msglim_reqstd - u16, Number of outstanding messages requested |
367 | * user_data - uchar[16], 16-byte user data | 367 | * user_data - uchar[16], 16-byte user data |
368 | * userid - uchar[8], User identification | 368 | * userid - uchar[8], User identification |
369 | * system_name - uchar[8], 8-byte identifying the system name | 369 | * system_name - uchar[8], 8-byte identifying the system name |
370 | * flags1 - int, Contains options for this path. | 370 | * flags1 - int, Contains options for this path. |
371 | * -IPPRTY - 0x20, Specifies if you want to send priority message. | 371 | * -IPPRTY - 0x20, Specifies if you want to send priority message. |
372 | * -IPRMDATA - 0x80, Specifies whether your program can handle a message | 372 | * -IPRMDATA - 0x80, Specifies whether your program can handle a message |
373 | * in the parameter list. | 373 | * in the parameter list. |
374 | * -IPQUSCE - 0x40, Specifies whether you want to quiesce the path being | 374 | * -IPQUSCE - 0x40, Specifies whether you want to quiesce the path being |
375 | * established. | 375 | * established. |
376 | * -IPLOCAL - 0X01, Allows an application to force the partner to be on | 376 | * -IPLOCAL - 0X01, Allows an application to force the partner to be on |
377 | * the local system. If local is specified then target class cannot be | 377 | * the local system. If local is specified then target class cannot be |
378 | * specified. | 378 | * specified. |
379 | * flags1_out - int * Contains information about the path | 379 | * flags1_out - int * Contains information about the path |
380 | * - IPPRTY - 0x20, Indicates you may send priority messages. | 380 | * - IPPRTY - 0x20, Indicates you may send priority messages. |
381 | * msglim - * u16, Number of outstanding messages | 381 | * msglim - * u16, Number of outstanding messages |
382 | * handle - iucv_handle_t, Address of handler | 382 | * handle - iucv_handle_t, Address of handler |
383 | * pgm_data - void *, Application data passed to interrupt handlers | 383 | * pgm_data - void *, Application data passed to interrupt handlers |
384 | * Output: return code from CP IUCV call | 384 | * Output: return code from CP IUCV call |
385 | * rc - return code from iucv_declare_buffer | 385 | * rc - return code from iucv_declare_buffer |
386 | * -EINVAL - Invalid handle passed by application | 386 | * -EINVAL - Invalid handle passed by application |
387 | * -EINVAL - Pathid address is NULL | 387 | * -EINVAL - Pathid address is NULL |
388 | * add_pathid_result - Return code from internal function add_pathid | 388 | * add_pathid_result - Return code from internal function add_pathid |
389 | */ | 389 | */ |
390 | int | 390 | int |
391 | iucv_connect (u16 * pathid, | 391 | iucv_connect (u16 * pathid, |
@@ -397,16 +397,16 @@ int | |||
397 | int *flags1_out, | 397 | int *flags1_out, |
398 | u16 * msglim, iucv_handle_t handle, void *pgm_data); | 398 | u16 * msglim, iucv_handle_t handle, void *pgm_data); |
399 | 399 | ||
400 | /* | 400 | /* |
401 | * Name: iucv_purge | 401 | * Name: iucv_purge |
402 | * Purpose: This function cancels a message that you have sent. | 402 | * Purpose: This function cancels a message that you have sent. |
403 | * Input: pathid - Path identification number. | 403 | * Input: pathid - Path identification number. |
404 | * msgid - Specifies the message ID of the message to be purged. | 404 | * msgid - Specifies the message ID of the message to be purged. |
405 | * srccls - Specifies the source message class. | 405 | * srccls - Specifies the source message class. |
406 | * Output: audit - Contains information about asynchronous error | 406 | * Output: audit - Contains information about asynchronous error |
407 | * that may have affected the normal completion | 407 | * that may have affected the normal completion |
408 | * of this message. | 408 | * of this message. |
409 | * Return: Return code from CP IUCV call. | 409 | * Return: Return code from CP IUCV call. |
410 | */ | 410 | */ |
411 | int iucv_purge (u16 pathid, u32 msgid, u32 srccls, __u32 *audit); | 411 | int iucv_purge (u16 pathid, u32 msgid, u32 srccls, __u32 *audit); |
412 | /* | 412 | /* |
@@ -426,38 +426,38 @@ ulong iucv_query_maxconn (void); | |||
426 | */ | 426 | */ |
427 | ulong iucv_query_bufsize (void); | 427 | ulong iucv_query_bufsize (void); |
428 | 428 | ||
429 | /* | 429 | /* |
430 | * Name: iucv_quiesce | 430 | * Name: iucv_quiesce |
431 | * Purpose: This function temporarily suspends incoming messages on an | 431 | * Purpose: This function temporarily suspends incoming messages on an |
432 | * IUCV path. You can later reactivate the path by invoking | 432 | * IUCV path. You can later reactivate the path by invoking |
433 | * the iucv_resume function. | 433 | * the iucv_resume function. |
434 | * Input: pathid - Path identification number | 434 | * Input: pathid - Path identification number |
435 | * user_data - 16-bytes of user data | 435 | * user_data - 16-bytes of user data |
436 | * Output: NA | 436 | * Output: NA |
437 | * Return: Return code from CP IUCV call. | 437 | * Return: Return code from CP IUCV call. |
438 | */ | 438 | */ |
439 | int iucv_quiesce (u16 pathid, uchar user_data[16]); | 439 | int iucv_quiesce (u16 pathid, uchar user_data[16]); |
440 | 440 | ||
441 | /* | 441 | /* |
442 | * Name: iucv_receive | 442 | * Name: iucv_receive |
443 | * Purpose: This function receives messages that are being sent to you | 443 | * Purpose: This function receives messages that are being sent to you |
444 | * over established paths. Data will be returned in buffer for length of | 444 | * over established paths. Data will be returned in buffer for length of |
445 | * buflen. | 445 | * buflen. |
446 | * Input: | 446 | * Input: |
447 | * pathid - Path identification number. | 447 | * pathid - Path identification number. |
448 | * buffer - Address of buffer to receive. | 448 | * buffer - Address of buffer to receive. |
449 | * buflen - Length of buffer to receive. | 449 | * buflen - Length of buffer to receive. |
450 | * msgid - Specifies the message ID. | 450 | * msgid - Specifies the message ID. |
451 | * trgcls - Specifies target class. | 451 | * trgcls - Specifies target class. |
452 | * Output: | 452 | * Output: |
453 | * flags1_out: int *, Contains information about this path. | 453 | * flags1_out: int *, Contains information about this path. |
454 | * IPNORPY - 0x10 Specifies this is a one-way message and no reply is | 454 | * IPNORPY - 0x10 Specifies this is a one-way message and no reply is |
455 | * expected. | 455 | * expected. |
456 | * IPPRTY - 0x20 Specifies if you want to send priority message. | 456 | * IPPRTY - 0x20 Specifies if you want to send priority message. |
457 | * IPRMDATA - 0x80 specifies the data is contained in the parameter list | 457 | * IPRMDATA - 0x80 specifies the data is contained in the parameter list |
458 | * residual_buffer - address of buffer updated by the number | 458 | * residual_buffer - address of buffer updated by the number |
459 | * of bytes you have received. | 459 | * of bytes you have received. |
460 | * residual_length - | 460 | * residual_length - |
461 | * Contains one of the following values, if the receive buffer is: | 461 | * Contains one of the following values, if the receive buffer is: |
462 | * The same length as the message, this field is zero. | 462 | * The same length as the message, this field is zero. |
463 | * Longer than the message, this field contains the number of | 463 | * Longer than the message, this field contains the number of |
@@ -466,8 +466,8 @@ int iucv_quiesce (u16 pathid, uchar user_data[16]); | |||
466 | * count (that is, the number of bytes remaining in the | 466 | * count (that is, the number of bytes remaining in the |
467 | * message that does not fit into the buffer. In this | 467 | * message that does not fit into the buffer. In this |
468 | * case b2f0_result = 5. | 468 | * case b2f0_result = 5. |
469 | * Return: Return code from CP IUCV call. | 469 | * Return: Return code from CP IUCV call. |
470 | * (-EINVAL) - buffer address is pointing to NULL | 470 | * (-EINVAL) - buffer address is pointing to NULL |
471 | */ | 471 | */ |
472 | int iucv_receive (u16 pathid, | 472 | int iucv_receive (u16 pathid, |
473 | u32 msgid, | 473 | u32 msgid, |
@@ -477,16 +477,16 @@ int iucv_receive (u16 pathid, | |||
477 | int *flags1_out, | 477 | int *flags1_out, |
478 | ulong * residual_buffer, ulong * residual_length); | 478 | ulong * residual_buffer, ulong * residual_length); |
479 | 479 | ||
480 | /* | 480 | /* |
481 | * Name: iucv_receive_array | 481 | * Name: iucv_receive_array |
482 | * Purpose: This function receives messages that are being sent to you | 482 | * Purpose: This function receives messages that are being sent to you |
483 | * over established paths. Data will be returned in first buffer for | 483 | * over established paths. Data will be returned in first buffer for |
484 | * length of first buffer. | 484 | * length of first buffer. |
485 | * Input: pathid - Path identification number. | 485 | * Input: pathid - Path identification number. |
486 | * msgid - specifies the message ID. | 486 | * msgid - specifies the message ID. |
487 | * trgcls - Specifies target class. | 487 | * trgcls - Specifies target class. |
488 | * buffer - Address of array of buffers. | 488 | * buffer - Address of array of buffers. |
489 | * buflen - Total length of buffers. | 489 | * buflen - Total length of buffers. |
490 | * Output: | 490 | * Output: |
491 | * flags1_out: int *, Contains information about this path. | 491 | * flags1_out: int *, Contains information about this path. |
492 | * IPNORPY - 0x10 Specifies this is a one-way message and no reply is | 492 | * IPNORPY - 0x10 Specifies this is a one-way message and no reply is |
@@ -504,8 +504,8 @@ int iucv_receive (u16 pathid, | |||
504 | * count (that is, the number of bytes remaining in the | 504 | * count (that is, the number of bytes remaining in the |
505 | * message that does not fit into the buffer. In this | 505 | * message that does not fit into the buffer. In this |
506 | * case b2f0_result = 5. | 506 | * case b2f0_result = 5. |
507 | * Return: Return code from CP IUCV call. | 507 | * Return: Return code from CP IUCV call. |
508 | * (-EINVAL) - Buffer address is NULL. | 508 | * (-EINVAL) - Buffer address is NULL. |
509 | */ | 509 | */ |
510 | int iucv_receive_array (u16 pathid, | 510 | int iucv_receive_array (u16 pathid, |
511 | u32 msgid, | 511 | u32 msgid, |
@@ -515,44 +515,44 @@ int iucv_receive_array (u16 pathid, | |||
515 | int *flags1_out, | 515 | int *flags1_out, |
516 | ulong * residual_buffer, ulong * residual_length); | 516 | ulong * residual_buffer, ulong * residual_length); |
517 | 517 | ||
518 | /* | 518 | /* |
519 | * Name: iucv_reject | 519 | * Name: iucv_reject |
520 | * Purpose: The reject function refuses a specified message. Between the | 520 | * Purpose: The reject function refuses a specified message. Between the |
521 | * time you are notified of a message and the time that you | 521 | * time you are notified of a message and the time that you |
522 | * complete the message, the message may be rejected. | 522 | * complete the message, the message may be rejected. |
523 | * Input: pathid - Path identification number. | 523 | * Input: pathid - Path identification number. |
524 | * msgid - Specifies the message ID. | 524 | * msgid - Specifies the message ID. |
525 | * trgcls - Specifies target class. | 525 | * trgcls - Specifies target class. |
526 | * Output: NA | 526 | * Output: NA |
527 | * Return: Return code from CP IUCV call. | 527 | * Return: Return code from CP IUCV call. |
528 | */ | 528 | */ |
529 | int iucv_reject (u16 pathid, u32 msgid, u32 trgcls); | 529 | int iucv_reject (u16 pathid, u32 msgid, u32 trgcls); |
530 | 530 | ||
531 | /* | 531 | /* |
532 | * Name: iucv_reply | 532 | * Name: iucv_reply |
533 | * Purpose: This function responds to the two-way messages that you | 533 | * Purpose: This function responds to the two-way messages that you |
534 | * receive. You must identify completely the message to | 534 | * receive. You must identify completely the message to |
535 | * which you wish to reply. ie, pathid, msgid, and trgcls. | 535 | * which you wish to reply. ie, pathid, msgid, and trgcls. |
536 | * Input: pathid - Path identification number. | 536 | * Input: pathid - Path identification number. |
537 | * msgid - Specifies the message ID. | 537 | * msgid - Specifies the message ID. |
538 | * trgcls - Specifies target class. | 538 | * trgcls - Specifies target class. |
539 | * flags1 - Option for path. | 539 | * flags1 - Option for path. |
540 | * IPPRTY- 0x20, Specifies if you want to send priority message. | 540 | * IPPRTY- 0x20, Specifies if you want to send priority message. |
541 | * buffer - Address of reply buffer. | 541 | * buffer - Address of reply buffer. |
542 | * buflen - Length of reply buffer. | 542 | * buflen - Length of reply buffer. |
543 | * Output: residual_buffer - Address of buffer updated by the number | 543 | * Output: residual_buffer - Address of buffer updated by the number |
544 | * of bytes you have moved. | 544 | * of bytes you have moved. |
545 | * residual_length - Contains one of the following values: | 545 | * residual_length - Contains one of the following values: |
546 | * If the answer buffer is the same length as the reply, this field | 546 | * If the answer buffer is the same length as the reply, this field |
547 | * contains zero. | 547 | * contains zero. |
548 | * If the answer buffer is longer than the reply, this field contains | 548 | * If the answer buffer is longer than the reply, this field contains |
549 | * the number of bytes remaining in the buffer. | 549 | * the number of bytes remaining in the buffer. |
550 | * If the answer buffer is shorter than the reply, this field contains | 550 | * If the answer buffer is shorter than the reply, this field contains |
551 | * a residual count (that is, the number of bytes remianing in the | 551 | * a residual count (that is, the number of bytes remianing in the |
552 | * reply that does not fit into the buffer. In this | 552 | * reply that does not fit into the buffer. In this |
553 | * case b2f0_result = 5. | 553 | * case b2f0_result = 5. |
554 | * Return: Return code from CP IUCV call. | 554 | * Return: Return code from CP IUCV call. |
555 | * (-EINVAL) - Buffer address is NULL. | 555 | * (-EINVAL) - Buffer address is NULL. |
556 | */ | 556 | */ |
557 | int iucv_reply (u16 pathid, | 557 | int iucv_reply (u16 pathid, |
558 | u32 msgid, | 558 | u32 msgid, |
@@ -561,20 +561,20 @@ int iucv_reply (u16 pathid, | |||
561 | void *buffer, ulong buflen, ulong * residual_buffer, | 561 | void *buffer, ulong buflen, ulong * residual_buffer, |
562 | ulong * residual_length); | 562 | ulong * residual_length); |
563 | 563 | ||
564 | /* | 564 | /* |
565 | * Name: iucv_reply_array | 565 | * Name: iucv_reply_array |
566 | * Purpose: This function responds to the two-way messages that you | 566 | * Purpose: This function responds to the two-way messages that you |
567 | * receive. You must identify completely the message to | 567 | * receive. You must identify completely the message to |
568 | * which you wish to reply. ie, pathid, msgid, and trgcls. | 568 | * which you wish to reply. ie, pathid, msgid, and trgcls. |
569 | * The array identifies a list of addresses and lengths of | 569 | * The array identifies a list of addresses and lengths of |
570 | * discontiguous buffers that contains the reply data. | 570 | * discontiguous buffers that contains the reply data. |
571 | * Input: pathid - Path identification number | 571 | * Input: pathid - Path identification number |
572 | * msgid - Specifies the message ID. | 572 | * msgid - Specifies the message ID. |
573 | * trgcls - Specifies target class. | 573 | * trgcls - Specifies target class. |
574 | * flags1 - Option for path. | 574 | * flags1 - Option for path. |
575 | * IPPRTY- 0x20, Specifies if you want to send priority message. | 575 | * IPPRTY- 0x20, Specifies if you want to send priority message. |
576 | * buffer - Address of array of reply buffers. | 576 | * buffer - Address of array of reply buffers. |
577 | * buflen - Total length of reply buffers. | 577 | * buflen - Total length of reply buffers. |
578 | * Output: residual_buffer - Address of buffer which IUCV is currently working on. | 578 | * Output: residual_buffer - Address of buffer which IUCV is currently working on. |
579 | * residual_length - Contains one of the following values: | 579 | * residual_length - Contains one of the following values: |
580 | * If the answer buffer is the same length as the reply, this field | 580 | * If the answer buffer is the same length as the reply, this field |
@@ -585,8 +585,8 @@ int iucv_reply (u16 pathid, | |||
585 | * a residual count (that is, the number of bytes remianing in the | 585 | * a residual count (that is, the number of bytes remianing in the |
586 | * reply that does not fit into the buffer. In this | 586 | * reply that does not fit into the buffer. In this |
587 | * case b2f0_result = 5. | 587 | * case b2f0_result = 5. |
588 | * Return: Return code from CP IUCV call. | 588 | * Return: Return code from CP IUCV call. |
589 | * (-EINVAL) - Buffer address is NULL. | 589 | * (-EINVAL) - Buffer address is NULL. |
590 | */ | 590 | */ |
591 | int iucv_reply_array (u16 pathid, | 591 | int iucv_reply_array (u16 pathid, |
592 | u32 msgid, | 592 | u32 msgid, |
@@ -596,77 +596,77 @@ int iucv_reply_array (u16 pathid, | |||
596 | ulong buflen, ulong * residual_address, | 596 | ulong buflen, ulong * residual_address, |
597 | ulong * residual_length); | 597 | ulong * residual_length); |
598 | 598 | ||
599 | /* | 599 | /* |
600 | * Name: iucv_reply_prmmsg | 600 | * Name: iucv_reply_prmmsg |
601 | * Purpose: This function responds to the two-way messages that you | 601 | * Purpose: This function responds to the two-way messages that you |
602 | * receive. You must identify completely the message to | 602 | * receive. You must identify completely the message to |
603 | * which you wish to reply. ie, pathid, msgid, and trgcls. | 603 | * which you wish to reply. ie, pathid, msgid, and trgcls. |
604 | * Prmmsg signifies the data is moved into the | 604 | * Prmmsg signifies the data is moved into the |
605 | * parameter list. | 605 | * parameter list. |
606 | * Input: pathid - Path identification number. | 606 | * Input: pathid - Path identification number. |
607 | * msgid - Specifies the message ID. | 607 | * msgid - Specifies the message ID. |
608 | * trgcls - Specifies target class. | 608 | * trgcls - Specifies target class. |
609 | * flags1 - Option for path. | 609 | * flags1 - Option for path. |
610 | * IPPRTY- 0x20 Specifies if you want to send priority message. | 610 | * IPPRTY- 0x20 Specifies if you want to send priority message. |
611 | * prmmsg - 8-bytes of data to be placed into the parameter. | 611 | * prmmsg - 8-bytes of data to be placed into the parameter. |
612 | * list. | 612 | * list. |
613 | * Output: NA | 613 | * Output: NA |
614 | * Return: Return code from CP IUCV call. | 614 | * Return: Return code from CP IUCV call. |
615 | */ | 615 | */ |
616 | int iucv_reply_prmmsg (u16 pathid, | 616 | int iucv_reply_prmmsg (u16 pathid, |
617 | u32 msgid, u32 trgcls, int flags1, uchar prmmsg[8]); | 617 | u32 msgid, u32 trgcls, int flags1, uchar prmmsg[8]); |
618 | 618 | ||
619 | /* | 619 | /* |
620 | * Name: iucv_resume | 620 | * Name: iucv_resume |
621 | * Purpose: This function restores communications over a quiesced path | 621 | * Purpose: This function restores communications over a quiesced path |
622 | * Input: pathid - Path identification number. | 622 | * Input: pathid - Path identification number. |
623 | * user_data - 16-bytes of user data. | 623 | * user_data - 16-bytes of user data. |
624 | * Output: NA | 624 | * Output: NA |
625 | * Return: Return code from CP IUCV call. | 625 | * Return: Return code from CP IUCV call. |
626 | */ | 626 | */ |
627 | int iucv_resume (u16 pathid, uchar user_data[16]); | 627 | int iucv_resume (u16 pathid, uchar user_data[16]); |
628 | 628 | ||
629 | /* | 629 | /* |
630 | * Name: iucv_send | 630 | * Name: iucv_send |
631 | * Purpose: This function transmits data to another application. | 631 | * Purpose: This function transmits data to another application. |
632 | * Data to be transmitted is in a buffer and this is a | 632 | * Data to be transmitted is in a buffer and this is a |
633 | * one-way message and the receiver will not reply to the | 633 | * one-way message and the receiver will not reply to the |
634 | * message. | 634 | * message. |
635 | * Input: pathid - Path identification number. | 635 | * Input: pathid - Path identification number. |
636 | * trgcls - Specifies target class. | 636 | * trgcls - Specifies target class. |
637 | * srccls - Specifies the source message class. | 637 | * srccls - Specifies the source message class. |
638 | * msgtag - Specifies a tag to be associated with the message. | 638 | * msgtag - Specifies a tag to be associated with the message. |
639 | * flags1 - Option for path. | 639 | * flags1 - Option for path. |
640 | * IPPRTY- 0x20 Specifies if you want to send priority message. | 640 | * IPPRTY- 0x20 Specifies if you want to send priority message. |
641 | * buffer - Address of send buffer. | 641 | * buffer - Address of send buffer. |
642 | * buflen - Length of send buffer. | 642 | * buflen - Length of send buffer. |
643 | * Output: msgid - Specifies the message ID. | 643 | * Output: msgid - Specifies the message ID. |
644 | * Return: Return code from CP IUCV call. | 644 | * Return: Return code from CP IUCV call. |
645 | * (-EINVAL) - Buffer address is NULL. | 645 | * (-EINVAL) - Buffer address is NULL. |
646 | */ | 646 | */ |
647 | int iucv_send (u16 pathid, | 647 | int iucv_send (u16 pathid, |
648 | u32 * msgid, | 648 | u32 * msgid, |
649 | u32 trgcls, | 649 | u32 trgcls, |
650 | u32 srccls, u32 msgtag, int flags1, void *buffer, ulong buflen); | 650 | u32 srccls, u32 msgtag, int flags1, void *buffer, ulong buflen); |
651 | 651 | ||
652 | /* | 652 | /* |
653 | * Name: iucv_send_array | 653 | * Name: iucv_send_array |
654 | * Purpose: This function transmits data to another application. | 654 | * Purpose: This function transmits data to another application. |
655 | * The contents of buffer is the address of the array of | 655 | * The contents of buffer is the address of the array of |
656 | * addresses and lengths of discontiguous buffers that hold | 656 | * addresses and lengths of discontiguous buffers that hold |
657 | * the message text. This is a one-way message and the | 657 | * the message text. This is a one-way message and the |
658 | * receiver will not reply to the message. | 658 | * receiver will not reply to the message. |
659 | * Input: pathid - Path identification number. | 659 | * Input: pathid - Path identification number. |
660 | * trgcls - Specifies target class. | 660 | * trgcls - Specifies target class. |
661 | * srccls - Specifies the source message class. | 661 | * srccls - Specifies the source message class. |
662 | * msgtag - Specifies a tag to be associated witht the message. | 662 | * msgtag - Specifies a tag to be associated witht the message. |
663 | * flags1 - Option for path. | 663 | * flags1 - Option for path. |
664 | * IPPRTY- specifies if you want to send priority message. | 664 | * IPPRTY- specifies if you want to send priority message. |
665 | * buffer - Address of array of send buffers. | 665 | * buffer - Address of array of send buffers. |
666 | * buflen - Total length of send buffers. | 666 | * buflen - Total length of send buffers. |
667 | * Output: msgid - Specifies the message ID. | 667 | * Output: msgid - Specifies the message ID. |
668 | * Return: Return code from CP IUCV call. | 668 | * Return: Return code from CP IUCV call. |
669 | * (-EINVAL) - Buffer address is NULL. | 669 | * (-EINVAL) - Buffer address is NULL. |
670 | */ | 670 | */ |
671 | int iucv_send_array (u16 pathid, | 671 | int iucv_send_array (u16 pathid, |
672 | u32 * msgid, | 672 | u32 * msgid, |
@@ -675,48 +675,48 @@ int iucv_send_array (u16 pathid, | |||
675 | u32 msgtag, | 675 | u32 msgtag, |
676 | int flags1, iucv_array_t * buffer, ulong buflen); | 676 | int flags1, iucv_array_t * buffer, ulong buflen); |
677 | 677 | ||
678 | /* | 678 | /* |
679 | * Name: iucv_send_prmmsg | 679 | * Name: iucv_send_prmmsg |
680 | * Purpose: This function transmits data to another application. | 680 | * Purpose: This function transmits data to another application. |
681 | * Prmmsg specifies that the 8-bytes of data are to be moved | 681 | * Prmmsg specifies that the 8-bytes of data are to be moved |
682 | * into the parameter list. This is a one-way message and the | 682 | * into the parameter list. This is a one-way message and the |
683 | * receiver will not reply to the message. | 683 | * receiver will not reply to the message. |
684 | * Input: pathid - Path identification number. | 684 | * Input: pathid - Path identification number. |
685 | * trgcls - Specifies target class. | 685 | * trgcls - Specifies target class. |
686 | * srccls - Specifies the source message class. | 686 | * srccls - Specifies the source message class. |
687 | * msgtag - Specifies a tag to be associated with the message. | 687 | * msgtag - Specifies a tag to be associated with the message. |
688 | * flags1 - Option for path. | 688 | * flags1 - Option for path. |
689 | * IPPRTY- 0x20 specifies if you want to send priority message. | 689 | * IPPRTY- 0x20 specifies if you want to send priority message. |
690 | * prmmsg - 8-bytes of data to be placed into parameter list. | 690 | * prmmsg - 8-bytes of data to be placed into parameter list. |
691 | * Output: msgid - Specifies the message ID. | 691 | * Output: msgid - Specifies the message ID. |
692 | * Return: Return code from CP IUCV call. | 692 | * Return: Return code from CP IUCV call. |
693 | */ | 693 | */ |
694 | int iucv_send_prmmsg (u16 pathid, | 694 | int iucv_send_prmmsg (u16 pathid, |
695 | u32 * msgid, | 695 | u32 * msgid, |
696 | u32 trgcls, | 696 | u32 trgcls, |
697 | u32 srccls, u32 msgtag, int flags1, uchar prmmsg[8]); | 697 | u32 srccls, u32 msgtag, int flags1, uchar prmmsg[8]); |
698 | 698 | ||
699 | /* | 699 | /* |
700 | * Name: iucv_send2way | 700 | * Name: iucv_send2way |
701 | * Purpose: This function transmits data to another application. | 701 | * Purpose: This function transmits data to another application. |
702 | * Data to be transmitted is in a buffer. The receiver | 702 | * Data to be transmitted is in a buffer. The receiver |
703 | * of the send is expected to reply to the message and | 703 | * of the send is expected to reply to the message and |
704 | * a buffer is provided into which IUCV moves the reply | 704 | * a buffer is provided into which IUCV moves the reply |
705 | * to this message. | 705 | * to this message. |
706 | * Input: pathid - Path identification number. | 706 | * Input: pathid - Path identification number. |
707 | * trgcls - Specifies target class. | 707 | * trgcls - Specifies target class. |
708 | * srccls - Specifies the source message class. | 708 | * srccls - Specifies the source message class. |
709 | * msgtag - Specifies a tag associated with the message. | 709 | * msgtag - Specifies a tag associated with the message. |
710 | * flags1 - Option for path. | 710 | * flags1 - Option for path. |
711 | * IPPRTY- 0x20 Specifies if you want to send priority message. | 711 | * IPPRTY- 0x20 Specifies if you want to send priority message. |
712 | * buffer - Address of send buffer. | 712 | * buffer - Address of send buffer. |
713 | * buflen - Length of send buffer. | 713 | * buflen - Length of send buffer. |
714 | * ansbuf - Address of buffer into which IUCV moves the reply of | 714 | * ansbuf - Address of buffer into which IUCV moves the reply of |
715 | * this message. | 715 | * this message. |
716 | * anslen - Address of length of buffer. | 716 | * anslen - Address of length of buffer. |
717 | * Output: msgid - Specifies the message ID. | 717 | * Output: msgid - Specifies the message ID. |
718 | * Return: Return code from CP IUCV call. | 718 | * Return: Return code from CP IUCV call. |
719 | * (-EINVAL) - Buffer or ansbuf address is NULL. | 719 | * (-EINVAL) - Buffer or ansbuf address is NULL. |
720 | */ | 720 | */ |
721 | int iucv_send2way (u16 pathid, | 721 | int iucv_send2way (u16 pathid, |
722 | u32 * msgid, | 722 | u32 * msgid, |
@@ -726,28 +726,28 @@ int iucv_send2way (u16 pathid, | |||
726 | int flags1, | 726 | int flags1, |
727 | void *buffer, ulong buflen, void *ansbuf, ulong anslen); | 727 | void *buffer, ulong buflen, void *ansbuf, ulong anslen); |
728 | 728 | ||
729 | /* | 729 | /* |
730 | * Name: iucv_send2way_array | 730 | * Name: iucv_send2way_array |
731 | * Purpose: This function transmits data to another application. | 731 | * Purpose: This function transmits data to another application. |
732 | * The contents of buffer is the address of the array of | 732 | * The contents of buffer is the address of the array of |
733 | * addresses and lengths of discontiguous buffers that hold | 733 | * addresses and lengths of discontiguous buffers that hold |
734 | * the message text. The receiver of the send is expected to | 734 | * the message text. The receiver of the send is expected to |
735 | * reply to the message and a buffer is provided into which | 735 | * reply to the message and a buffer is provided into which |
736 | * IUCV moves the reply to this message. | 736 | * IUCV moves the reply to this message. |
737 | * Input: pathid - Path identification number. | 737 | * Input: pathid - Path identification number. |
738 | * trgcls - Specifies target class. | 738 | * trgcls - Specifies target class. |
739 | * srccls - Specifies the source message class. | 739 | * srccls - Specifies the source message class. |
740 | * msgtag - Specifies a tag to be associated with the message. | 740 | * msgtag - Specifies a tag to be associated with the message. |
741 | * flags1 - Option for path. | 741 | * flags1 - Option for path. |
742 | * IPPRTY- 0x20 Specifies if you want to send priority message. | 742 | * IPPRTY- 0x20 Specifies if you want to send priority message. |
743 | * buffer - Sddress of array of send buffers. | 743 | * buffer - Sddress of array of send buffers. |
744 | * buflen - Total length of send buffers. | 744 | * buflen - Total length of send buffers. |
745 | * ansbuf - Address of array of buffer into which IUCV moves the reply | 745 | * ansbuf - Address of array of buffer into which IUCV moves the reply |
746 | * of this message. | 746 | * of this message. |
747 | * anslen - Address of length reply buffers. | 747 | * anslen - Address of length reply buffers. |
748 | * Output: msgid - Specifies the message ID. | 748 | * Output: msgid - Specifies the message ID. |
749 | * Return: Return code from CP IUCV call. | 749 | * Return: Return code from CP IUCV call. |
750 | * (-EINVAL) - Buffer address is NULL. | 750 | * (-EINVAL) - Buffer address is NULL. |
751 | */ | 751 | */ |
752 | int iucv_send2way_array (u16 pathid, | 752 | int iucv_send2way_array (u16 pathid, |
753 | u32 * msgid, | 753 | u32 * msgid, |
@@ -758,27 +758,27 @@ int iucv_send2way_array (u16 pathid, | |||
758 | iucv_array_t * buffer, | 758 | iucv_array_t * buffer, |
759 | ulong buflen, iucv_array_t * ansbuf, ulong anslen); | 759 | ulong buflen, iucv_array_t * ansbuf, ulong anslen); |
760 | 760 | ||
761 | /* | 761 | /* |
762 | * Name: iucv_send2way_prmmsg | 762 | * Name: iucv_send2way_prmmsg |
763 | * Purpose: This function transmits data to another application. | 763 | * Purpose: This function transmits data to another application. |
764 | * Prmmsg specifies that the 8-bytes of data are to be moved | 764 | * Prmmsg specifies that the 8-bytes of data are to be moved |
765 | * into the parameter list. This is a two-way message and the | 765 | * into the parameter list. This is a two-way message and the |
766 | * receiver of the message is expected to reply. A buffer | 766 | * receiver of the message is expected to reply. A buffer |
767 | * is provided into which IUCV moves the reply to this | 767 | * is provided into which IUCV moves the reply to this |
768 | * message. | 768 | * message. |
769 | * Input: pathid - Rath identification number. | 769 | * Input: pathid - Rath identification number. |
770 | * trgcls - Specifies target class. | 770 | * trgcls - Specifies target class. |
771 | * srccls - Specifies the source message class. | 771 | * srccls - Specifies the source message class. |
772 | * msgtag - Specifies a tag to be associated with the message. | 772 | * msgtag - Specifies a tag to be associated with the message. |
773 | * flags1 - Option for path. | 773 | * flags1 - Option for path. |
774 | * IPPRTY- 0x20 Specifies if you want to send priority message. | 774 | * IPPRTY- 0x20 Specifies if you want to send priority message. |
775 | * prmmsg - 8-bytes of data to be placed in parameter list. | 775 | * prmmsg - 8-bytes of data to be placed in parameter list. |
776 | * ansbuf - Address of buffer into which IUCV moves the reply of | 776 | * ansbuf - Address of buffer into which IUCV moves the reply of |
777 | * this message. | 777 | * this message. |
778 | * anslen - Address of length of buffer. | 778 | * anslen - Address of length of buffer. |
779 | * Output: msgid - Specifies the message ID. | 779 | * Output: msgid - Specifies the message ID. |
780 | * Return: Return code from CP IUCV call. | 780 | * Return: Return code from CP IUCV call. |
781 | * (-EINVAL) - Buffer address is NULL. | 781 | * (-EINVAL) - Buffer address is NULL. |
782 | */ | 782 | */ |
783 | int iucv_send2way_prmmsg (u16 pathid, | 783 | int iucv_send2way_prmmsg (u16 pathid, |
784 | u32 * msgid, | 784 | u32 * msgid, |
@@ -788,29 +788,29 @@ int iucv_send2way_prmmsg (u16 pathid, | |||
788 | ulong flags1, | 788 | ulong flags1, |
789 | uchar prmmsg[8], void *ansbuf, ulong anslen); | 789 | uchar prmmsg[8], void *ansbuf, ulong anslen); |
790 | 790 | ||
791 | /* | 791 | /* |
792 | * Name: iucv_send2way_prmmsg_array | 792 | * Name: iucv_send2way_prmmsg_array |
793 | * Purpose: This function transmits data to another application. | 793 | * Purpose: This function transmits data to another application. |
794 | * Prmmsg specifies that the 8-bytes of data are to be moved | 794 | * Prmmsg specifies that the 8-bytes of data are to be moved |
795 | * into the parameter list. This is a two-way message and the | 795 | * into the parameter list. This is a two-way message and the |
796 | * receiver of the message is expected to reply. A buffer | 796 | * receiver of the message is expected to reply. A buffer |
797 | * is provided into which IUCV moves the reply to this | 797 | * is provided into which IUCV moves the reply to this |
798 | * message. The contents of ansbuf is the address of the | 798 | * message. The contents of ansbuf is the address of the |
799 | * array of addresses and lengths of discontiguous buffers | 799 | * array of addresses and lengths of discontiguous buffers |
800 | * that contain the reply. | 800 | * that contain the reply. |
801 | * Input: pathid - Path identification number. | 801 | * Input: pathid - Path identification number. |
802 | * trgcls - Specifies target class. | 802 | * trgcls - Specifies target class. |
803 | * srccls - Specifies the source message class. | 803 | * srccls - Specifies the source message class. |
804 | * msgtag - Specifies a tag to be associated with the message. | 804 | * msgtag - Specifies a tag to be associated with the message. |
805 | * flags1 - Option for path. | 805 | * flags1 - Option for path. |
806 | * IPPRTY- 0x20 specifies if you want to send priority message. | 806 | * IPPRTY- 0x20 specifies if you want to send priority message. |
807 | * prmmsg - 8-bytes of data to be placed into the parameter list. | 807 | * prmmsg - 8-bytes of data to be placed into the parameter list. |
808 | * ansbuf - Address of array of buffer into which IUCV moves the reply | 808 | * ansbuf - Address of array of buffer into which IUCV moves the reply |
809 | * of this message. | 809 | * of this message. |
810 | * anslen - Address of length of reply buffers. | 810 | * anslen - Address of length of reply buffers. |
811 | * Output: msgid - Specifies the message ID. | 811 | * Output: msgid - Specifies the message ID. |
812 | * Return: Return code from CP IUCV call. | 812 | * Return: Return code from CP IUCV call. |
813 | * (-EINVAL) - Ansbuf address is NULL. | 813 | * (-EINVAL) - Ansbuf address is NULL. |
814 | */ | 814 | */ |
815 | int iucv_send2way_prmmsg_array (u16 pathid, | 815 | int iucv_send2way_prmmsg_array (u16 pathid, |
816 | u32 * msgid, | 816 | u32 * msgid, |
@@ -821,29 +821,29 @@ int iucv_send2way_prmmsg_array (u16 pathid, | |||
821 | uchar prmmsg[8], | 821 | uchar prmmsg[8], |
822 | iucv_array_t * ansbuf, ulong anslen); | 822 | iucv_array_t * ansbuf, ulong anslen); |
823 | 823 | ||
824 | /* | 824 | /* |
825 | * Name: iucv_setmask | 825 | * Name: iucv_setmask |
826 | * Purpose: This function enables or disables the following IUCV | 826 | * Purpose: This function enables or disables the following IUCV |
827 | * external interruptions: Nonpriority and priority message | 827 | * external interruptions: Nonpriority and priority message |
828 | * interrupts, nonpriority and priority reply interrupts. | 828 | * interrupts, nonpriority and priority reply interrupts. |
829 | * Input: SetMaskFlag - options for interrupts | 829 | * Input: SetMaskFlag - options for interrupts |
830 | * 0x80 - Nonpriority_MessagePendingInterruptsFlag | 830 | * 0x80 - Nonpriority_MessagePendingInterruptsFlag |
831 | * 0x40 - Priority_MessagePendingInterruptsFlag | 831 | * 0x40 - Priority_MessagePendingInterruptsFlag |
832 | * 0x20 - Nonpriority_MessageCompletionInterruptsFlag | 832 | * 0x20 - Nonpriority_MessageCompletionInterruptsFlag |
833 | * 0x10 - Priority_MessageCompletionInterruptsFlag | 833 | * 0x10 - Priority_MessageCompletionInterruptsFlag |
834 | * 0x08 - IUCVControlInterruptsFlag | 834 | * 0x08 - IUCVControlInterruptsFlag |
835 | * Output: NA | 835 | * Output: NA |
836 | * Return: Return code from CP IUCV call. | 836 | * Return: Return code from CP IUCV call. |
837 | */ | 837 | */ |
838 | int iucv_setmask (int SetMaskFlag); | 838 | int iucv_setmask (int SetMaskFlag); |
839 | 839 | ||
840 | /* | 840 | /* |
841 | * Name: iucv_sever | 841 | * Name: iucv_sever |
842 | * Purpose: This function terminates an IUCV path. | 842 | * Purpose: This function terminates an IUCV path. |
843 | * Input: pathid - Path identification number. | 843 | * Input: pathid - Path identification number. |
844 | * user_data - 16-bytes of user data. | 844 | * user_data - 16-bytes of user data. |
845 | * Output: NA | 845 | * Output: NA |
846 | * Return: Return code from CP IUCV call. | 846 | * Return: Return code from CP IUCV call. |
847 | * (-EINVAL) - Interal error, wild pointer. | 847 | * (-EINVAL) - Interal error, wild pointer. |
848 | */ | 848 | */ |
849 | int iucv_sever (u16 pathid, uchar user_data[16]); | 849 | int iucv_sever (u16 pathid, uchar user_data[16]); |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index c915bb5d5a93..f94419b334f7 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
@@ -1290,7 +1290,7 @@ lcs_set_multicast_list(struct net_device *dev) | |||
1290 | LCS_DBF_TEXT(4, trace, "setmulti"); | 1290 | LCS_DBF_TEXT(4, trace, "setmulti"); |
1291 | card = (struct lcs_card *) dev->priv; | 1291 | card = (struct lcs_card *) dev->priv; |
1292 | 1292 | ||
1293 | if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) | 1293 | if (!lcs_set_thread_start_bit(card, LCS_SET_MC_THREAD)) |
1294 | schedule_work(&card->kernel_thread_starter); | 1294 | schedule_work(&card->kernel_thread_starter); |
1295 | } | 1295 | } |
1296 | 1296 | ||
@@ -1399,7 +1399,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1399 | /* Check for channel and device errors presented */ | 1399 | /* Check for channel and device errors presented */ |
1400 | rc = lcs_get_problem(cdev, irb); | 1400 | rc = lcs_get_problem(cdev, irb); |
1401 | if (rc || (dstat & DEV_STAT_UNIT_EXCEP)) { | 1401 | if (rc || (dstat & DEV_STAT_UNIT_EXCEP)) { |
1402 | PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n", | 1402 | PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n", |
1403 | cdev->dev.bus_id, dstat, cstat); | 1403 | cdev->dev.bus_id, dstat, cstat); |
1404 | if (rc) { | 1404 | if (rc) { |
1405 | lcs_schedule_recovery(card); | 1405 | lcs_schedule_recovery(card); |
@@ -1410,7 +1410,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) | |||
1410 | /* How far in the ccw chain have we processed? */ | 1410 | /* How far in the ccw chain have we processed? */ |
1411 | if ((channel->state != CH_STATE_INIT) && | 1411 | if ((channel->state != CH_STATE_INIT) && |
1412 | (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) { | 1412 | (irb->scsw.fctl & SCSW_FCTL_START_FUNC)) { |
1413 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cpa) | 1413 | index = (struct ccw1 *) __va((addr_t) irb->scsw.cpa) |
1414 | - channel->ccws; | 1414 | - channel->ccws; |
1415 | if ((irb->scsw.actl & SCSW_ACTL_SUSPENDED) || | 1415 | if ((irb->scsw.actl & SCSW_ACTL_SUSPENDED) || |
1416 | (irb->scsw.cstat & SCHN_STAT_PCI)) | 1416 | (irb->scsw.cstat & SCHN_STAT_PCI)) |
@@ -1733,7 +1733,7 @@ lcs_start_kernel_thread(struct lcs_card *card) | |||
1733 | kernel_thread(lcs_recovery, (void *) card, SIGCHLD); | 1733 | kernel_thread(lcs_recovery, (void *) card, SIGCHLD); |
1734 | #ifdef CONFIG_IP_MULTICAST | 1734 | #ifdef CONFIG_IP_MULTICAST |
1735 | if (lcs_do_start_thread(card, LCS_SET_MC_THREAD)) | 1735 | if (lcs_do_start_thread(card, LCS_SET_MC_THREAD)) |
1736 | kernel_thread(lcs_register_mc_addresses, | 1736 | kernel_thread(lcs_register_mc_addresses, |
1737 | (void *) card, SIGCHLD); | 1737 | (void *) card, SIGCHLD); |
1738 | #endif | 1738 | #endif |
1739 | } | 1739 | } |
@@ -1994,7 +1994,7 @@ lcs_timeout_store (struct device *dev, struct device_attribute *attr, const char | |||
1994 | DEVICE_ATTR(lancmd_timeout, 0644, lcs_timeout_show, lcs_timeout_store); | 1994 | DEVICE_ATTR(lancmd_timeout, 0644, lcs_timeout_show, lcs_timeout_store); |
1995 | 1995 | ||
1996 | static ssize_t | 1996 | static ssize_t |
1997 | lcs_dev_recover_store(struct device *dev, struct device_attribute *attr, | 1997 | lcs_dev_recover_store(struct device *dev, struct device_attribute *attr, |
1998 | const char *buf, size_t count) | 1998 | const char *buf, size_t count) |
1999 | { | 1999 | { |
2000 | struct lcs_card *card = dev->driver_data; | 2000 | struct lcs_card *card = dev->driver_data; |
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index 260a93c8c442..b452cc1afd55 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c | |||
@@ -30,7 +30,7 @@ | |||
30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 30 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
31 | * | 31 | * |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #undef DEBUG | 34 | #undef DEBUG |
35 | 35 | ||
36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
@@ -65,7 +65,7 @@ MODULE_AUTHOR | |||
65 | ("(C) 2001 IBM Corporation by Fritz Elfert (felfert@millenux.com)"); | 65 | ("(C) 2001 IBM Corporation by Fritz Elfert (felfert@millenux.com)"); |
66 | MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver"); | 66 | MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver"); |
67 | 67 | ||
68 | 68 | ||
69 | #define PRINTK_HEADER " iucv: " /* for debugging */ | 69 | #define PRINTK_HEADER " iucv: " /* for debugging */ |
70 | 70 | ||
71 | static struct device_driver netiucv_driver = { | 71 | static struct device_driver netiucv_driver = { |
@@ -202,7 +202,7 @@ netiucv_printname(char *name) | |||
202 | *p = '\0'; | 202 | *p = '\0'; |
203 | return tmp; | 203 | return tmp; |
204 | } | 204 | } |
205 | 205 | ||
206 | /** | 206 | /** |
207 | * States of the interface statemachine. | 207 | * States of the interface statemachine. |
208 | */ | 208 | */ |
@@ -244,7 +244,7 @@ static const char *dev_event_names[] = { | |||
244 | "Connection up", | 244 | "Connection up", |
245 | "Connection down", | 245 | "Connection down", |
246 | }; | 246 | }; |
247 | 247 | ||
248 | /** | 248 | /** |
249 | * Events of the connection statemachine | 249 | * Events of the connection statemachine |
250 | */ | 250 | */ |
@@ -364,7 +364,7 @@ static const char *conn_state_names[] = { | |||
364 | "Connect error", | 364 | "Connect error", |
365 | }; | 365 | }; |
366 | 366 | ||
367 | 367 | ||
368 | /** | 368 | /** |
369 | * Debug Facility Stuff | 369 | * Debug Facility Stuff |
370 | */ | 370 | */ |
@@ -516,7 +516,7 @@ static void | |||
516 | fsm_action_nop(fsm_instance *fi, int event, void *arg) | 516 | fsm_action_nop(fsm_instance *fi, int event, void *arg) |
517 | { | 517 | { |
518 | } | 518 | } |
519 | 519 | ||
520 | /** | 520 | /** |
521 | * Actions of the connection statemachine | 521 | * Actions of the connection statemachine |
522 | *****************************************************************************/ | 522 | *****************************************************************************/ |
@@ -993,7 +993,7 @@ static const fsm_node conn_fsm[] = { | |||
993 | 993 | ||
994 | static const int CONN_FSM_LEN = sizeof(conn_fsm) / sizeof(fsm_node); | 994 | static const int CONN_FSM_LEN = sizeof(conn_fsm) / sizeof(fsm_node); |
995 | 995 | ||
996 | 996 | ||
997 | /** | 997 | /** |
998 | * Actions for interface - statemachine. | 998 | * Actions for interface - statemachine. |
999 | *****************************************************************************/ | 999 | *****************************************************************************/ |
@@ -1182,7 +1182,7 @@ netiucv_transmit_skb(struct iucv_connection *conn, struct sk_buff *skb) { | |||
1182 | 1182 | ||
1183 | fsm_newstate(conn->fsm, CONN_STATE_TX); | 1183 | fsm_newstate(conn->fsm, CONN_STATE_TX); |
1184 | conn->prof.send_stamp = xtime; | 1184 | conn->prof.send_stamp = xtime; |
1185 | 1185 | ||
1186 | rc = iucv_send(conn->pathid, NULL, 0, 0, 1 /* single_flag */, | 1186 | rc = iucv_send(conn->pathid, NULL, 0, 0, 1 /* single_flag */, |
1187 | 0, nskb->data, nskb->len); | 1187 | 0, nskb->data, nskb->len); |
1188 | /* Shut up, gcc! nskb is always below 2G. */ | 1188 | /* Shut up, gcc! nskb is always below 2G. */ |
@@ -1220,7 +1220,7 @@ netiucv_transmit_skb(struct iucv_connection *conn, struct sk_buff *skb) { | |||
1220 | 1220 | ||
1221 | return rc; | 1221 | return rc; |
1222 | } | 1222 | } |
1223 | 1223 | ||
1224 | /** | 1224 | /** |
1225 | * Interface API for upper network layers | 1225 | * Interface API for upper network layers |
1226 | *****************************************************************************/ | 1226 | *****************************************************************************/ |
@@ -1291,7 +1291,7 @@ static int netiucv_tx(struct sk_buff *skb, struct net_device *dev) | |||
1291 | 1291 | ||
1292 | /** | 1292 | /** |
1293 | * If connection is not running, try to restart it | 1293 | * If connection is not running, try to restart it |
1294 | * and throw away packet. | 1294 | * and throw away packet. |
1295 | */ | 1295 | */ |
1296 | if (fsm_getstate(privptr->fsm) != DEV_STATE_RUNNING) { | 1296 | if (fsm_getstate(privptr->fsm) != DEV_STATE_RUNNING) { |
1297 | fsm_event(privptr->fsm, DEV_EVENT_START, dev); | 1297 | fsm_event(privptr->fsm, DEV_EVENT_START, dev); |
@@ -1538,7 +1538,7 @@ static ssize_t | |||
1538 | maxcq_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 1538 | maxcq_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1539 | { | 1539 | { |
1540 | struct netiucv_priv *priv = dev->driver_data; | 1540 | struct netiucv_priv *priv = dev->driver_data; |
1541 | 1541 | ||
1542 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); | 1542 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); |
1543 | priv->conn->prof.maxcqueue = 0; | 1543 | priv->conn->prof.maxcqueue = 0; |
1544 | return count; | 1544 | return count; |
@@ -1559,7 +1559,7 @@ static ssize_t | |||
1559 | sdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 1559 | sdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1560 | { | 1560 | { |
1561 | struct netiucv_priv *priv = dev->driver_data; | 1561 | struct netiucv_priv *priv = dev->driver_data; |
1562 | 1562 | ||
1563 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); | 1563 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); |
1564 | priv->conn->prof.doios_single = 0; | 1564 | priv->conn->prof.doios_single = 0; |
1565 | return count; | 1565 | return count; |
@@ -1580,7 +1580,7 @@ static ssize_t | |||
1580 | mdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 1580 | mdoio_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1581 | { | 1581 | { |
1582 | struct netiucv_priv *priv = dev->driver_data; | 1582 | struct netiucv_priv *priv = dev->driver_data; |
1583 | 1583 | ||
1584 | IUCV_DBF_TEXT(trace, 5, __FUNCTION__); | 1584 | IUCV_DBF_TEXT(trace, 5, __FUNCTION__); |
1585 | priv->conn->prof.doios_multi = 0; | 1585 | priv->conn->prof.doios_multi = 0; |
1586 | return count; | 1586 | return count; |
@@ -1601,7 +1601,7 @@ static ssize_t | |||
1601 | txlen_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 1601 | txlen_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1602 | { | 1602 | { |
1603 | struct netiucv_priv *priv = dev->driver_data; | 1603 | struct netiucv_priv *priv = dev->driver_data; |
1604 | 1604 | ||
1605 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); | 1605 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); |
1606 | priv->conn->prof.txlen = 0; | 1606 | priv->conn->prof.txlen = 0; |
1607 | return count; | 1607 | return count; |
@@ -1622,7 +1622,7 @@ static ssize_t | |||
1622 | txtime_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) | 1622 | txtime_write (struct device *dev, struct device_attribute *attr, const char *buf, size_t count) |
1623 | { | 1623 | { |
1624 | struct netiucv_priv *priv = dev->driver_data; | 1624 | struct netiucv_priv *priv = dev->driver_data; |
1625 | 1625 | ||
1626 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); | 1626 | IUCV_DBF_TEXT(trace, 4, __FUNCTION__); |
1627 | priv->conn->prof.tx_time = 0; | 1627 | priv->conn->prof.tx_time = 0; |
1628 | return count; | 1628 | return count; |
@@ -2000,7 +2000,7 @@ conn_write(struct device_driver *drv, const char *buf, size_t count) | |||
2000 | } | 2000 | } |
2001 | 2001 | ||
2002 | PRINT_INFO("%s: '%s'\n", dev->name, netiucv_printname(username)); | 2002 | PRINT_INFO("%s: '%s'\n", dev->name, netiucv_printname(username)); |
2003 | 2003 | ||
2004 | return count; | 2004 | return count; |
2005 | 2005 | ||
2006 | out_free_ndev: | 2006 | out_free_ndev: |
@@ -2099,7 +2099,7 @@ static int __init | |||
2099 | netiucv_init(void) | 2099 | netiucv_init(void) |
2100 | { | 2100 | { |
2101 | int ret; | 2101 | int ret; |
2102 | 2102 | ||
2103 | ret = iucv_register_dbf_views(); | 2103 | ret = iucv_register_dbf_views(); |
2104 | if (ret) { | 2104 | if (ret) { |
2105 | PRINT_WARN("netiucv_init failed, " | 2105 | PRINT_WARN("netiucv_init failed, " |
@@ -2128,7 +2128,7 @@ netiucv_init(void) | |||
2128 | } | 2128 | } |
2129 | return ret; | 2129 | return ret; |
2130 | } | 2130 | } |
2131 | 2131 | ||
2132 | module_init(netiucv_init); | 2132 | module_init(netiucv_init); |
2133 | module_exit(netiucv_exit); | 2133 | module_exit(netiucv_exit); |
2134 | MODULE_LICENSE("GPL"); | 2134 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/s390/net/qeth.h b/drivers/s390/net/qeth.h index 65e2b1bc08a5..619f4a0c7160 100644 --- a/drivers/s390/net/qeth.h +++ b/drivers/s390/net/qeth.h | |||
@@ -376,7 +376,7 @@ struct qeth_hdr_osn { | |||
376 | __u8 reserved3[18]; | 376 | __u8 reserved3[18]; |
377 | __u32 ccid; | 377 | __u32 ccid; |
378 | } __attribute__ ((packed)); | 378 | } __attribute__ ((packed)); |
379 | 379 | ||
380 | struct qeth_hdr { | 380 | struct qeth_hdr { |
381 | union { | 381 | union { |
382 | struct qeth_hdr_layer2 l2; | 382 | struct qeth_hdr_layer2 l2; |
@@ -825,7 +825,7 @@ struct qeth_card { | |||
825 | int use_hard_stop; | 825 | int use_hard_stop; |
826 | int (*orig_hard_header)(struct sk_buff *,struct net_device *, | 826 | int (*orig_hard_header)(struct sk_buff *,struct net_device *, |
827 | unsigned short,void *,void *,unsigned); | 827 | unsigned short,void *,void *,unsigned); |
828 | struct qeth_osn_info osn_info; | 828 | struct qeth_osn_info osn_info; |
829 | }; | 829 | }; |
830 | 830 | ||
831 | struct qeth_card_list_struct { | 831 | struct qeth_card_list_struct { |
@@ -944,7 +944,7 @@ qeth_get_netdev_flags(struct qeth_card *card) | |||
944 | return 0; | 944 | return 0; |
945 | switch (card->info.type) { | 945 | switch (card->info.type) { |
946 | case QETH_CARD_TYPE_IQD: | 946 | case QETH_CARD_TYPE_IQD: |
947 | case QETH_CARD_TYPE_OSN: | 947 | case QETH_CARD_TYPE_OSN: |
948 | return IFF_NOARP; | 948 | return IFF_NOARP; |
949 | #ifdef CONFIG_QETH_IPV6 | 949 | #ifdef CONFIG_QETH_IPV6 |
950 | default: | 950 | default: |
@@ -981,7 +981,7 @@ static inline int | |||
981 | qeth_get_max_mtu_for_card(int cardtype) | 981 | qeth_get_max_mtu_for_card(int cardtype) |
982 | { | 982 | { |
983 | switch (cardtype) { | 983 | switch (cardtype) { |
984 | 984 | ||
985 | case QETH_CARD_TYPE_UNKNOWN: | 985 | case QETH_CARD_TYPE_UNKNOWN: |
986 | case QETH_CARD_TYPE_OSAE: | 986 | case QETH_CARD_TYPE_OSAE: |
987 | case QETH_CARD_TYPE_OSN: | 987 | case QETH_CARD_TYPE_OSN: |
@@ -1097,7 +1097,7 @@ qeth_string_to_ipaddr4(const char *buf, __u8 *addr) | |||
1097 | int count = 0, rc = 0; | 1097 | int count = 0, rc = 0; |
1098 | int in[4]; | 1098 | int in[4]; |
1099 | 1099 | ||
1100 | rc = sscanf(buf, "%d.%d.%d.%d%n", | 1100 | rc = sscanf(buf, "%d.%d.%d.%d%n", |
1101 | &in[0], &in[1], &in[2], &in[3], &count); | 1101 | &in[0], &in[1], &in[2], &in[3], &count); |
1102 | if (rc != 4 || count<=0) | 1102 | if (rc != 4 || count<=0) |
1103 | return -EINVAL; | 1103 | return -EINVAL; |
@@ -1131,7 +1131,7 @@ qeth_string_to_ipaddr6(const char *buf, __u8 *addr) | |||
1131 | 1131 | ||
1132 | cnt = out = found = save_cnt = num2 = 0; | 1132 | cnt = out = found = save_cnt = num2 = 0; |
1133 | end = start = (char *) buf; | 1133 | end = start = (char *) buf; |
1134 | in = (__u16 *) addr; | 1134 | in = (__u16 *) addr; |
1135 | memset(in, 0, 16); | 1135 | memset(in, 0, 16); |
1136 | while (end) { | 1136 | while (end) { |
1137 | end = strchr(end,':'); | 1137 | end = strchr(end,':'); |
@@ -1139,7 +1139,7 @@ qeth_string_to_ipaddr6(const char *buf, __u8 *addr) | |||
1139 | end = (char *)buf + (strlen(buf)); | 1139 | end = (char *)buf + (strlen(buf)); |
1140 | out = 1; | 1140 | out = 1; |
1141 | } | 1141 | } |
1142 | if ((end - start)) { | 1142 | if ((end - start)) { |
1143 | memset(num, 0, 5); | 1143 | memset(num, 0, 5); |
1144 | memcpy(num, start, end - start); | 1144 | memcpy(num, start, end - start); |
1145 | if (!qeth_isxdigit(num)) | 1145 | if (!qeth_isxdigit(num)) |
@@ -1241,5 +1241,5 @@ qeth_osn_register(unsigned char *read_dev_no, | |||
1241 | 1241 | ||
1242 | extern void | 1242 | extern void |
1243 | qeth_osn_deregister(struct net_device *); | 1243 | qeth_osn_deregister(struct net_device *); |
1244 | 1244 | ||
1245 | #endif /* __QETH_H__ */ | 1245 | #endif /* __QETH_H__ */ |
diff --git a/drivers/s390/net/qeth_eddp.c b/drivers/s390/net/qeth_eddp.c index 44e226f211e7..0bab60a20309 100644 --- a/drivers/s390/net/qeth_eddp.c +++ b/drivers/s390/net/qeth_eddp.c | |||
@@ -81,7 +81,7 @@ void | |||
81 | qeth_eddp_buf_release_contexts(struct qeth_qdio_out_buffer *buf) | 81 | qeth_eddp_buf_release_contexts(struct qeth_qdio_out_buffer *buf) |
82 | { | 82 | { |
83 | struct qeth_eddp_context_reference *ref; | 83 | struct qeth_eddp_context_reference *ref; |
84 | 84 | ||
85 | QETH_DBF_TEXT(trace, 6, "eddprctx"); | 85 | QETH_DBF_TEXT(trace, 6, "eddprctx"); |
86 | while (!list_empty(&buf->ctx_list)){ | 86 | while (!list_empty(&buf->ctx_list)){ |
87 | ref = list_entry(buf->ctx_list.next, | 87 | ref = list_entry(buf->ctx_list.next, |
@@ -135,7 +135,7 @@ qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, | |||
135 | "buffer!\n"); | 135 | "buffer!\n"); |
136 | goto out; | 136 | goto out; |
137 | } | 137 | } |
138 | } | 138 | } |
139 | /* check if the whole next skb fits into current buffer */ | 139 | /* check if the whole next skb fits into current buffer */ |
140 | if ((QETH_MAX_BUFFER_ELEMENTS(queue->card) - | 140 | if ((QETH_MAX_BUFFER_ELEMENTS(queue->card) - |
141 | buf->next_element_to_fill) | 141 | buf->next_element_to_fill) |
@@ -148,7 +148,7 @@ qeth_eddp_fill_buffer(struct qeth_qdio_out_q *queue, | |||
148 | * and increment ctx's refcnt */ | 148 | * and increment ctx's refcnt */ |
149 | must_refcnt = 1; | 149 | must_refcnt = 1; |
150 | continue; | 150 | continue; |
151 | } | 151 | } |
152 | if (must_refcnt){ | 152 | if (must_refcnt){ |
153 | must_refcnt = 0; | 153 | must_refcnt = 0; |
154 | if (qeth_eddp_buf_ref_context(buf, ctx)){ | 154 | if (qeth_eddp_buf_ref_context(buf, ctx)){ |
@@ -266,7 +266,7 @@ qeth_eddp_copy_data_tcp(char *dst, struct qeth_eddp_data *eddp, int len, | |||
266 | int left_in_frag; | 266 | int left_in_frag; |
267 | int copy_len; | 267 | int copy_len; |
268 | u8 *src; | 268 | u8 *src; |
269 | 269 | ||
270 | QETH_DBF_TEXT(trace, 5, "eddpcdtc"); | 270 | QETH_DBF_TEXT(trace, 5, "eddpcdtc"); |
271 | if (skb_shinfo(eddp->skb)->nr_frags == 0) { | 271 | if (skb_shinfo(eddp->skb)->nr_frags == 0) { |
272 | memcpy(dst, eddp->skb->data + eddp->skb_offset, len); | 272 | memcpy(dst, eddp->skb->data + eddp->skb_offset, len); |
@@ -408,7 +408,7 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, | |||
408 | struct tcphdr *tcph; | 408 | struct tcphdr *tcph; |
409 | int data_len; | 409 | int data_len; |
410 | u32 hcsum; | 410 | u32 hcsum; |
411 | 411 | ||
412 | QETH_DBF_TEXT(trace, 5, "eddpftcp"); | 412 | QETH_DBF_TEXT(trace, 5, "eddpftcp"); |
413 | eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl; | 413 | eddp->skb_offset = sizeof(struct qeth_hdr) + eddp->nhl + eddp->thl; |
414 | if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2) { | 414 | if (eddp->qh.hdr.l2.id == QETH_HEADER_TYPE_LAYER2) { |
@@ -465,13 +465,13 @@ __qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, | |||
465 | eddp->th.tcp.h.seq += data_len; | 465 | eddp->th.tcp.h.seq += data_len; |
466 | } | 466 | } |
467 | } | 467 | } |
468 | 468 | ||
469 | static inline int | 469 | static inline int |
470 | qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, | 470 | qeth_eddp_fill_context_tcp(struct qeth_eddp_context *ctx, |
471 | struct sk_buff *skb, struct qeth_hdr *qhdr) | 471 | struct sk_buff *skb, struct qeth_hdr *qhdr) |
472 | { | 472 | { |
473 | struct qeth_eddp_data *eddp = NULL; | 473 | struct qeth_eddp_data *eddp = NULL; |
474 | 474 | ||
475 | QETH_DBF_TEXT(trace, 5, "eddpficx"); | 475 | QETH_DBF_TEXT(trace, 5, "eddpficx"); |
476 | /* create our segmentation headers and copy original headers */ | 476 | /* create our segmentation headers and copy original headers */ |
477 | if (skb->protocol == ETH_P_IP) | 477 | if (skb->protocol == ETH_P_IP) |
@@ -512,7 +512,7 @@ qeth_eddp_calc_num_pages(struct qeth_eddp_context *ctx, struct sk_buff *skb, | |||
512 | int hdr_len) | 512 | int hdr_len) |
513 | { | 513 | { |
514 | int skbs_per_page; | 514 | int skbs_per_page; |
515 | 515 | ||
516 | QETH_DBF_TEXT(trace, 5, "eddpcanp"); | 516 | QETH_DBF_TEXT(trace, 5, "eddpcanp"); |
517 | /* can we put multiple skbs in one page? */ | 517 | /* can we put multiple skbs in one page? */ |
518 | skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->tso_size + hdr_len); | 518 | skbs_per_page = PAGE_SIZE / (skb_shinfo(skb)->tso_size + hdr_len); |
@@ -588,7 +588,7 @@ qeth_eddp_create_context_tcp(struct qeth_card *card, struct sk_buff *skb, | |||
588 | struct qeth_hdr *qhdr) | 588 | struct qeth_hdr *qhdr) |
589 | { | 589 | { |
590 | struct qeth_eddp_context *ctx = NULL; | 590 | struct qeth_eddp_context *ctx = NULL; |
591 | 591 | ||
592 | QETH_DBF_TEXT(trace, 5, "creddpct"); | 592 | QETH_DBF_TEXT(trace, 5, "creddpct"); |
593 | if (skb->protocol == ETH_P_IP) | 593 | if (skb->protocol == ETH_P_IP) |
594 | ctx = qeth_eddp_create_context_generic(card, skb, | 594 | ctx = qeth_eddp_create_context_generic(card, skb, |
diff --git a/drivers/s390/net/qeth_fs.h b/drivers/s390/net/qeth_fs.h index e422b41c656e..61faf05517d6 100644 --- a/drivers/s390/net/qeth_fs.h +++ b/drivers/s390/net/qeth_fs.h | |||
@@ -42,7 +42,7 @@ qeth_create_device_attributes_osn(struct device *dev); | |||
42 | 42 | ||
43 | extern void | 43 | extern void |
44 | qeth_remove_device_attributes_osn(struct device *dev); | 44 | qeth_remove_device_attributes_osn(struct device *dev); |
45 | 45 | ||
46 | extern int | 46 | extern int |
47 | qeth_create_driver_attributes(void); | 47 | qeth_create_driver_attributes(void); |
48 | 48 | ||
diff --git a/drivers/s390/net/qeth_main.c b/drivers/s390/net/qeth_main.c index 9dbb5be2b63c..9e671a48cd2f 100644 --- a/drivers/s390/net/qeth_main.c +++ b/drivers/s390/net/qeth_main.c | |||
@@ -513,7 +513,7 @@ __qeth_set_offline(struct ccwgroup_device *cgdev, int recovery_mode) | |||
513 | 513 | ||
514 | QETH_DBF_TEXT(setup, 3, "setoffl"); | 514 | QETH_DBF_TEXT(setup, 3, "setoffl"); |
515 | QETH_DBF_HEX(setup, 3, &card, sizeof(void *)); | 515 | QETH_DBF_HEX(setup, 3, &card, sizeof(void *)); |
516 | 516 | ||
517 | if (card->dev && netif_carrier_ok(card->dev)) | 517 | if (card->dev && netif_carrier_ok(card->dev)) |
518 | netif_carrier_off(card->dev); | 518 | netif_carrier_off(card->dev); |
519 | recover_flag = card->state; | 519 | recover_flag = card->state; |
@@ -604,13 +604,13 @@ __qeth_ref_ip_on_card(struct qeth_card *card, struct qeth_ipaddr *todo, | |||
604 | list_for_each_entry(addr, &card->ip_list, entry) { | 604 | list_for_each_entry(addr, &card->ip_list, entry) { |
605 | if (card->options.layer2) { | 605 | if (card->options.layer2) { |
606 | if ((addr->type == todo->type) && | 606 | if ((addr->type == todo->type) && |
607 | (memcmp(&addr->mac, &todo->mac, | 607 | (memcmp(&addr->mac, &todo->mac, |
608 | OSA_ADDR_LEN) == 0)) { | 608 | OSA_ADDR_LEN) == 0)) { |
609 | found = 1; | 609 | found = 1; |
610 | break; | 610 | break; |
611 | } | 611 | } |
612 | continue; | 612 | continue; |
613 | } | 613 | } |
614 | if ((addr->proto == QETH_PROT_IPV4) && | 614 | if ((addr->proto == QETH_PROT_IPV4) && |
615 | (todo->proto == QETH_PROT_IPV4) && | 615 | (todo->proto == QETH_PROT_IPV4) && |
616 | (addr->type == todo->type) && | 616 | (addr->type == todo->type) && |
@@ -694,13 +694,13 @@ __qeth_insert_ip_todo(struct qeth_card *card, struct qeth_ipaddr *addr, int add) | |||
694 | if (card->options.layer2) { | 694 | if (card->options.layer2) { |
695 | if ((tmp->type == addr->type) && | 695 | if ((tmp->type == addr->type) && |
696 | (tmp->is_multicast == addr->is_multicast) && | 696 | (tmp->is_multicast == addr->is_multicast) && |
697 | (memcmp(&tmp->mac, &addr->mac, | 697 | (memcmp(&tmp->mac, &addr->mac, |
698 | OSA_ADDR_LEN) == 0)) { | 698 | OSA_ADDR_LEN) == 0)) { |
699 | found = 1; | 699 | found = 1; |
700 | break; | 700 | break; |
701 | } | 701 | } |
702 | continue; | 702 | continue; |
703 | } | 703 | } |
704 | if ((tmp->proto == QETH_PROT_IPV4) && | 704 | if ((tmp->proto == QETH_PROT_IPV4) && |
705 | (addr->proto == QETH_PROT_IPV4) && | 705 | (addr->proto == QETH_PROT_IPV4) && |
706 | (tmp->type == addr->type) && | 706 | (tmp->type == addr->type) && |
@@ -1173,7 +1173,7 @@ qeth_determine_card_type(struct qeth_card *card) | |||
1173 | "due to hardware limitations!\n"); | 1173 | "due to hardware limitations!\n"); |
1174 | card->qdio.no_out_queues = 1; | 1174 | card->qdio.no_out_queues = 1; |
1175 | card->qdio.default_out_queue = 0; | 1175 | card->qdio.default_out_queue = 0; |
1176 | } | 1176 | } |
1177 | return 0; | 1177 | return 0; |
1178 | } | 1178 | } |
1179 | i++; | 1179 | i++; |
@@ -1198,7 +1198,7 @@ qeth_probe_device(struct ccwgroup_device *gdev) | |||
1198 | return -ENODEV; | 1198 | return -ENODEV; |
1199 | 1199 | ||
1200 | QETH_DBF_TEXT_(setup, 2, "%s", gdev->dev.bus_id); | 1200 | QETH_DBF_TEXT_(setup, 2, "%s", gdev->dev.bus_id); |
1201 | 1201 | ||
1202 | card = qeth_alloc_card(); | 1202 | card = qeth_alloc_card(); |
1203 | if (!card) { | 1203 | if (!card) { |
1204 | put_device(dev); | 1204 | put_device(dev); |
@@ -1220,7 +1220,7 @@ qeth_probe_device(struct ccwgroup_device *gdev) | |||
1220 | put_device(dev); | 1220 | put_device(dev); |
1221 | qeth_free_card(card); | 1221 | qeth_free_card(card); |
1222 | return rc; | 1222 | return rc; |
1223 | } | 1223 | } |
1224 | if ((rc = qeth_setup_card(card))){ | 1224 | if ((rc = qeth_setup_card(card))){ |
1225 | QETH_DBF_TEXT_(setup, 2, "2err%d", rc); | 1225 | QETH_DBF_TEXT_(setup, 2, "2err%d", rc); |
1226 | put_device(dev); | 1226 | put_device(dev); |
@@ -1843,7 +1843,7 @@ struct qeth_cmd_buffer *iob) | |||
1843 | &card->seqno.pdu_hdr_ack, QETH_SEQ_NO_LENGTH); | 1843 | &card->seqno.pdu_hdr_ack, QETH_SEQ_NO_LENGTH); |
1844 | QETH_DBF_HEX(control, 2, iob->data, QETH_DBF_CONTROL_LEN); | 1844 | QETH_DBF_HEX(control, 2, iob->data, QETH_DBF_CONTROL_LEN); |
1845 | } | 1845 | } |
1846 | 1846 | ||
1847 | static int | 1847 | static int |
1848 | qeth_send_control_data(struct qeth_card *card, int len, | 1848 | qeth_send_control_data(struct qeth_card *card, int len, |
1849 | struct qeth_cmd_buffer *iob, | 1849 | struct qeth_cmd_buffer *iob, |
@@ -1937,7 +1937,7 @@ qeth_osn_send_control_data(struct qeth_card *card, int len, | |||
1937 | wake_up(&card->wait_q); | 1937 | wake_up(&card->wait_q); |
1938 | } | 1938 | } |
1939 | return rc; | 1939 | return rc; |
1940 | } | 1940 | } |
1941 | 1941 | ||
1942 | static inline void | 1942 | static inline void |
1943 | qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob, | 1943 | qeth_prepare_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob, |
@@ -1966,7 +1966,7 @@ qeth_osn_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob, | |||
1966 | memcpy(QETH_IPA_PDU_LEN_PDU3(iob->data), &s2, 2); | 1966 | memcpy(QETH_IPA_PDU_LEN_PDU3(iob->data), &s2, 2); |
1967 | return qeth_osn_send_control_data(card, s1, iob); | 1967 | return qeth_osn_send_control_data(card, s1, iob); |
1968 | } | 1968 | } |
1969 | 1969 | ||
1970 | static int | 1970 | static int |
1971 | qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob, | 1971 | qeth_send_ipa_cmd(struct qeth_card *card, struct qeth_cmd_buffer *iob, |
1972 | int (*reply_cb) | 1972 | int (*reply_cb) |
@@ -2579,7 +2579,7 @@ qeth_process_inbound_buffer(struct qeth_card *card, | |||
2579 | skb->dev = card->dev; | 2579 | skb->dev = card->dev; |
2580 | if (hdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) | 2580 | if (hdr->hdr.l2.id == QETH_HEADER_TYPE_LAYER2) |
2581 | vlan_tag = qeth_layer2_rebuild_skb(card, skb, hdr); | 2581 | vlan_tag = qeth_layer2_rebuild_skb(card, skb, hdr); |
2582 | else if (hdr->hdr.l3.id == QETH_HEADER_TYPE_LAYER3) | 2582 | else if (hdr->hdr.l3.id == QETH_HEADER_TYPE_LAYER3) |
2583 | qeth_rebuild_skb(card, skb, hdr); | 2583 | qeth_rebuild_skb(card, skb, hdr); |
2584 | else { /*in case of OSN*/ | 2584 | else { /*in case of OSN*/ |
2585 | skb_push(skb, sizeof(struct qeth_hdr)); | 2585 | skb_push(skb, sizeof(struct qeth_hdr)); |
@@ -2763,7 +2763,7 @@ qeth_qdio_input_handler(struct ccw_device * ccwdev, unsigned int status, | |||
2763 | index = i % QDIO_MAX_BUFFERS_PER_Q; | 2763 | index = i % QDIO_MAX_BUFFERS_PER_Q; |
2764 | buffer = &card->qdio.in_q->bufs[index]; | 2764 | buffer = &card->qdio.in_q->bufs[index]; |
2765 | if (!((status & QDIO_STATUS_LOOK_FOR_ERROR) && | 2765 | if (!((status & QDIO_STATUS_LOOK_FOR_ERROR) && |
2766 | qeth_check_qdio_errors(buffer->buffer, | 2766 | qeth_check_qdio_errors(buffer->buffer, |
2767 | qdio_err, siga_err,"qinerr"))) | 2767 | qdio_err, siga_err,"qinerr"))) |
2768 | qeth_process_inbound_buffer(card, buffer, index); | 2768 | qeth_process_inbound_buffer(card, buffer, index); |
2769 | /* clear buffer and give back to hardware */ | 2769 | /* clear buffer and give back to hardware */ |
@@ -3187,7 +3187,7 @@ qeth_alloc_qdio_buffers(struct qeth_card *card) | |||
3187 | if (card->qdio.state == QETH_QDIO_ALLOCATED) | 3187 | if (card->qdio.state == QETH_QDIO_ALLOCATED) |
3188 | return 0; | 3188 | return 0; |
3189 | 3189 | ||
3190 | card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q), | 3190 | card->qdio.in_q = kmalloc(sizeof(struct qeth_qdio_q), |
3191 | GFP_KERNEL|GFP_DMA); | 3191 | GFP_KERNEL|GFP_DMA); |
3192 | if (!card->qdio.in_q) | 3192 | if (!card->qdio.in_q) |
3193 | return - ENOMEM; | 3193 | return - ENOMEM; |
@@ -3476,7 +3476,7 @@ qeth_halt_channels(struct qeth_card *card) | |||
3476 | rc3 = qeth_halt_channel(&card->data); | 3476 | rc3 = qeth_halt_channel(&card->data); |
3477 | if (rc1) | 3477 | if (rc1) |
3478 | return rc1; | 3478 | return rc1; |
3479 | if (rc2) | 3479 | if (rc2) |
3480 | return rc2; | 3480 | return rc2; |
3481 | return rc3; | 3481 | return rc3; |
3482 | } | 3482 | } |
@@ -3491,7 +3491,7 @@ qeth_clear_channels(struct qeth_card *card) | |||
3491 | rc3 = qeth_clear_channel(&card->data); | 3491 | rc3 = qeth_clear_channel(&card->data); |
3492 | if (rc1) | 3492 | if (rc1) |
3493 | return rc1; | 3493 | return rc1; |
3494 | if (rc2) | 3494 | if (rc2) |
3495 | return rc2; | 3495 | return rc2; |
3496 | return rc3; | 3496 | return rc3; |
3497 | } | 3497 | } |
@@ -3802,7 +3802,7 @@ qeth_open(struct net_device *dev) | |||
3802 | card->state = CARD_STATE_UP; | 3802 | card->state = CARD_STATE_UP; |
3803 | card->dev->flags |= IFF_UP; | 3803 | card->dev->flags |= IFF_UP; |
3804 | netif_start_queue(dev); | 3804 | netif_start_queue(dev); |
3805 | 3805 | ||
3806 | if (!card->lan_online && netif_carrier_ok(dev)) | 3806 | if (!card->lan_online && netif_carrier_ok(dev)) |
3807 | netif_carrier_off(dev); | 3807 | netif_carrier_off(dev); |
3808 | return 0; | 3808 | return 0; |
@@ -4098,7 +4098,7 @@ qeth_fill_header(struct qeth_card *card, struct qeth_hdr *hdr, | |||
4098 | } | 4098 | } |
4099 | } else { /* passthrough */ | 4099 | } else { /* passthrough */ |
4100 | if((skb->dev->type == ARPHRD_IEEE802_TR) && | 4100 | if((skb->dev->type == ARPHRD_IEEE802_TR) && |
4101 | !memcmp(skb->data + sizeof(struct qeth_hdr) + | 4101 | !memcmp(skb->data + sizeof(struct qeth_hdr) + |
4102 | sizeof(__u16), skb->dev->broadcast, 6)) { | 4102 | sizeof(__u16), skb->dev->broadcast, 6)) { |
4103 | hdr->hdr.l3.flags = QETH_CAST_BROADCAST | | 4103 | hdr->hdr.l3.flags = QETH_CAST_BROADCAST | |
4104 | QETH_HDR_PASSTHRU; | 4104 | QETH_HDR_PASSTHRU; |
@@ -4385,7 +4385,7 @@ out: | |||
4385 | } | 4385 | } |
4386 | 4386 | ||
4387 | static inline int | 4387 | static inline int |
4388 | qeth_get_elements_no(struct qeth_card *card, void *hdr, | 4388 | qeth_get_elements_no(struct qeth_card *card, void *hdr, |
4389 | struct sk_buff *skb, int elems) | 4389 | struct sk_buff *skb, int elems) |
4390 | { | 4390 | { |
4391 | int elements_needed = 0; | 4391 | int elements_needed = 0; |
@@ -4443,7 +4443,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb) | |||
4443 | return 0; | 4443 | return 0; |
4444 | } | 4444 | } |
4445 | cast_type = qeth_get_cast_type(card, skb); | 4445 | cast_type = qeth_get_cast_type(card, skb); |
4446 | if ((cast_type == RTN_BROADCAST) && | 4446 | if ((cast_type == RTN_BROADCAST) && |
4447 | (card->info.broadcast_capable == 0)){ | 4447 | (card->info.broadcast_capable == 0)){ |
4448 | card->stats.tx_dropped++; | 4448 | card->stats.tx_dropped++; |
4449 | card->stats.tx_errors++; | 4449 | card->stats.tx_errors++; |
@@ -4465,7 +4465,7 @@ qeth_send_packet(struct qeth_card *card, struct sk_buff *skb) | |||
4465 | card->stats.tx_errors++; | 4465 | card->stats.tx_errors++; |
4466 | dev_kfree_skb_any(skb); | 4466 | dev_kfree_skb_any(skb); |
4467 | return NETDEV_TX_OK; | 4467 | return NETDEV_TX_OK; |
4468 | } | 4468 | } |
4469 | elements_needed++; | 4469 | elements_needed++; |
4470 | } else { | 4470 | } else { |
4471 | if ((rc = qeth_prepare_skb(card, &skb, &hdr, ipv))) { | 4471 | if ((rc = qeth_prepare_skb(card, &skb, &hdr, ipv))) { |
@@ -5375,7 +5375,7 @@ qeth_layer2_send_setdelvlan_cb(struct qeth_card *card, | |||
5375 | cmd = (struct qeth_ipa_cmd *) data; | 5375 | cmd = (struct qeth_ipa_cmd *) data; |
5376 | if (cmd->hdr.return_code) { | 5376 | if (cmd->hdr.return_code) { |
5377 | PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. " | 5377 | PRINT_ERR("Error in processing VLAN %i on %s: 0x%x. " |
5378 | "Continuing\n",cmd->data.setdelvlan.vlan_id, | 5378 | "Continuing\n",cmd->data.setdelvlan.vlan_id, |
5379 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); | 5379 | QETH_CARD_IFNAME(card), cmd->hdr.return_code); |
5380 | QETH_DBF_TEXT_(trace, 2, "L2VL%4x", cmd->hdr.command); | 5380 | QETH_DBF_TEXT_(trace, 2, "L2VL%4x", cmd->hdr.command); |
5381 | QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card)); | 5381 | QETH_DBF_TEXT_(trace, 2, "L2%s", CARD_BUS_ID(card)); |
@@ -5395,7 +5395,7 @@ qeth_layer2_send_setdelvlan(struct qeth_card *card, __u16 i, | |||
5395 | iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4); | 5395 | iob = qeth_get_ipacmd_buffer(card, ipacmd, QETH_PROT_IPV4); |
5396 | cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); | 5396 | cmd = (struct qeth_ipa_cmd *)(iob->data+IPA_PDU_HEADER_SIZE); |
5397 | cmd->data.setdelvlan.vlan_id = i; | 5397 | cmd->data.setdelvlan.vlan_id = i; |
5398 | return qeth_send_ipa_cmd(card, iob, | 5398 | return qeth_send_ipa_cmd(card, iob, |
5399 | qeth_layer2_send_setdelvlan_cb, NULL); | 5399 | qeth_layer2_send_setdelvlan_cb, NULL); |
5400 | } | 5400 | } |
5401 | 5401 | ||
@@ -5459,7 +5459,7 @@ qeth_vlan_rx_kill_vid(struct net_device *dev, unsigned short vid) | |||
5459 | * Examine hardware response to SET_PROMISC_MODE | 5459 | * Examine hardware response to SET_PROMISC_MODE |
5460 | */ | 5460 | */ |
5461 | static int | 5461 | static int |
5462 | qeth_setadp_promisc_mode_cb(struct qeth_card *card, | 5462 | qeth_setadp_promisc_mode_cb(struct qeth_card *card, |
5463 | struct qeth_reply *reply, | 5463 | struct qeth_reply *reply, |
5464 | unsigned long data) | 5464 | unsigned long data) |
5465 | { | 5465 | { |
@@ -5470,10 +5470,10 @@ qeth_setadp_promisc_mode_cb(struct qeth_card *card, | |||
5470 | 5470 | ||
5471 | cmd = (struct qeth_ipa_cmd *) data; | 5471 | cmd = (struct qeth_ipa_cmd *) data; |
5472 | setparms = &(cmd->data.setadapterparms); | 5472 | setparms = &(cmd->data.setadapterparms); |
5473 | 5473 | ||
5474 | qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd); | 5474 | qeth_default_setadapterparms_cb(card, reply, (unsigned long)cmd); |
5475 | if (cmd->hdr.return_code) { | 5475 | if (cmd->hdr.return_code) { |
5476 | QETH_DBF_TEXT_(trace,4,"prmrc%2.2x",cmd->hdr.return_code); | 5476 | QETH_DBF_TEXT_(trace,4,"prmrc%2.2x",cmd->hdr.return_code); |
5477 | setparms->data.mode = SET_PROMISC_MODE_OFF; | 5477 | setparms->data.mode = SET_PROMISC_MODE_OFF; |
5478 | } | 5478 | } |
5479 | card->info.promisc_mode = setparms->data.mode; | 5479 | card->info.promisc_mode = setparms->data.mode; |
@@ -5519,7 +5519,7 @@ qeth_set_multicast_list(struct net_device *dev) | |||
5519 | 5519 | ||
5520 | if (card->info.type == QETH_CARD_TYPE_OSN) | 5520 | if (card->info.type == QETH_CARD_TYPE_OSN) |
5521 | return ; | 5521 | return ; |
5522 | 5522 | ||
5523 | QETH_DBF_TEXT(trace, 3, "setmulti"); | 5523 | QETH_DBF_TEXT(trace, 3, "setmulti"); |
5524 | qeth_delete_mc_addresses(card); | 5524 | qeth_delete_mc_addresses(card); |
5525 | if (card->options.layer2) { | 5525 | if (card->options.layer2) { |
@@ -5577,7 +5577,7 @@ qeth_osn_assist(struct net_device *dev, | |||
5577 | struct qeth_cmd_buffer *iob; | 5577 | struct qeth_cmd_buffer *iob; |
5578 | struct qeth_card *card; | 5578 | struct qeth_card *card; |
5579 | int rc; | 5579 | int rc; |
5580 | 5580 | ||
5581 | QETH_DBF_TEXT(trace, 2, "osnsdmc"); | 5581 | QETH_DBF_TEXT(trace, 2, "osnsdmc"); |
5582 | if (!dev) | 5582 | if (!dev) |
5583 | return -ENODEV; | 5583 | return -ENODEV; |
@@ -5656,7 +5656,7 @@ qeth_osn_deregister(struct net_device * dev) | |||
5656 | card->osn_info.data_cb = NULL; | 5656 | card->osn_info.data_cb = NULL; |
5657 | return; | 5657 | return; |
5658 | } | 5658 | } |
5659 | 5659 | ||
5660 | static void | 5660 | static void |
5661 | qeth_delete_mc_addresses(struct qeth_card *card) | 5661 | qeth_delete_mc_addresses(struct qeth_card *card) |
5662 | { | 5662 | { |
@@ -5820,7 +5820,7 @@ qeth_add_multicast_ipv6(struct qeth_card *card) | |||
5820 | struct inet6_dev *in6_dev; | 5820 | struct inet6_dev *in6_dev; |
5821 | 5821 | ||
5822 | QETH_DBF_TEXT(trace,4,"chkmcv6"); | 5822 | QETH_DBF_TEXT(trace,4,"chkmcv6"); |
5823 | if (!qeth_is_supported(card, IPA_IPV6)) | 5823 | if (!qeth_is_supported(card, IPA_IPV6)) |
5824 | return ; | 5824 | return ; |
5825 | in6_dev = in6_dev_get(card->dev); | 5825 | in6_dev = in6_dev_get(card->dev); |
5826 | if (in6_dev == NULL) | 5826 | if (in6_dev == NULL) |
@@ -6372,7 +6372,7 @@ qeth_netdev_init(struct net_device *dev) | |||
6372 | if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD)) | 6372 | if (!(card->info.unique_id & UNIQUE_ID_NOT_BY_CARD)) |
6373 | card->dev->dev_id = card->info.unique_id & 0xffff; | 6373 | card->dev->dev_id = card->info.unique_id & 0xffff; |
6374 | #endif | 6374 | #endif |
6375 | if (card->options.fake_ll && | 6375 | if (card->options.fake_ll && |
6376 | (qeth_get_netdev_flags(card) & IFF_NOARP)) | 6376 | (qeth_get_netdev_flags(card) & IFF_NOARP)) |
6377 | dev->hard_header = qeth_fake_header; | 6377 | dev->hard_header = qeth_fake_header; |
6378 | dev->hard_header_parse = NULL; | 6378 | dev->hard_header_parse = NULL; |
@@ -6479,7 +6479,7 @@ retry: | |||
6479 | /*network device will be recovered*/ | 6479 | /*network device will be recovered*/ |
6480 | if (card->dev) { | 6480 | if (card->dev) { |
6481 | card->dev->hard_header = card->orig_hard_header; | 6481 | card->dev->hard_header = card->orig_hard_header; |
6482 | if (card->options.fake_ll && | 6482 | if (card->options.fake_ll && |
6483 | (qeth_get_netdev_flags(card) & IFF_NOARP)) | 6483 | (qeth_get_netdev_flags(card) & IFF_NOARP)) |
6484 | card->dev->hard_header = qeth_fake_header; | 6484 | card->dev->hard_header = qeth_fake_header; |
6485 | return 0; | 6485 | return 0; |
@@ -6589,7 +6589,7 @@ qeth_setadpparms_change_macaddr_cb(struct qeth_card *card, | |||
6589 | 6589 | ||
6590 | cmd = (struct qeth_ipa_cmd *) data; | 6590 | cmd = (struct qeth_ipa_cmd *) data; |
6591 | if (!card->options.layer2 || card->info.guestlan || | 6591 | if (!card->options.layer2 || card->info.guestlan || |
6592 | !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) { | 6592 | !(card->info.mac_bits & QETH_LAYER2_MAC_READ)) { |
6593 | memcpy(card->dev->dev_addr, | 6593 | memcpy(card->dev->dev_addr, |
6594 | &cmd->data.setadapterparms.data.change_addr.addr, | 6594 | &cmd->data.setadapterparms.data.change_addr.addr, |
6595 | OSA_ADDR_LEN); | 6595 | OSA_ADDR_LEN); |
@@ -7572,7 +7572,7 @@ qeth_stop_card(struct qeth_card *card, int recovery_mode) | |||
7572 | if (card->read.state == CH_STATE_UP && | 7572 | if (card->read.state == CH_STATE_UP && |
7573 | card->write.state == CH_STATE_UP && | 7573 | card->write.state == CH_STATE_UP && |
7574 | (card->state == CARD_STATE_UP)) { | 7574 | (card->state == CARD_STATE_UP)) { |
7575 | if (recovery_mode && | 7575 | if (recovery_mode && |
7576 | card->info.type != QETH_CARD_TYPE_OSN) { | 7576 | card->info.type != QETH_CARD_TYPE_OSN) { |
7577 | qeth_stop(card->dev); | 7577 | qeth_stop(card->dev); |
7578 | } else { | 7578 | } else { |
@@ -7741,7 +7741,7 @@ static int | |||
7741 | qeth_register_netdev(struct qeth_card *card) | 7741 | qeth_register_netdev(struct qeth_card *card) |
7742 | { | 7742 | { |
7743 | QETH_DBF_TEXT(setup, 3, "regnetd"); | 7743 | QETH_DBF_TEXT(setup, 3, "regnetd"); |
7744 | if (card->dev->reg_state != NETREG_UNINITIALIZED) | 7744 | if (card->dev->reg_state != NETREG_UNINITIALIZED) |
7745 | return 0; | 7745 | return 0; |
7746 | /* sysfs magic */ | 7746 | /* sysfs magic */ |
7747 | SET_NETDEV_DEV(card->dev, &card->gdev->dev); | 7747 | SET_NETDEV_DEV(card->dev, &card->gdev->dev); |
@@ -7753,7 +7753,7 @@ qeth_start_again(struct qeth_card *card, int recovery_mode) | |||
7753 | { | 7753 | { |
7754 | QETH_DBF_TEXT(setup ,2, "startag"); | 7754 | QETH_DBF_TEXT(setup ,2, "startag"); |
7755 | 7755 | ||
7756 | if (recovery_mode && | 7756 | if (recovery_mode && |
7757 | card->info.type != QETH_CARD_TYPE_OSN) { | 7757 | card->info.type != QETH_CARD_TYPE_OSN) { |
7758 | qeth_open(card->dev); | 7758 | qeth_open(card->dev); |
7759 | } else { | 7759 | } else { |
diff --git a/drivers/s390/net/qeth_mpc.h b/drivers/s390/net/qeth_mpc.h index 011c41041029..0477c47471c5 100644 --- a/drivers/s390/net/qeth_mpc.h +++ b/drivers/s390/net/qeth_mpc.h | |||
@@ -445,7 +445,7 @@ enum qeth_ipa_arp_return_codes { | |||
445 | /* Helper functions */ | 445 | /* Helper functions */ |
446 | #define IS_IPA_REPLY(cmd) ((cmd->hdr.initiator == IPA_CMD_INITIATOR_HOST) || \ | 446 | #define IS_IPA_REPLY(cmd) ((cmd->hdr.initiator == IPA_CMD_INITIATOR_HOST) || \ |
447 | (cmd->hdr.initiator == IPA_CMD_INITIATOR_OSA_REPLY)) | 447 | (cmd->hdr.initiator == IPA_CMD_INITIATOR_OSA_REPLY)) |
448 | 448 | ||
449 | /*****************************************************************************/ | 449 | /*****************************************************************************/ |
450 | /* END OF IP Assist related definitions */ | 450 | /* END OF IP Assist related definitions */ |
451 | /*****************************************************************************/ | 451 | /*****************************************************************************/ |
@@ -490,7 +490,7 @@ extern unsigned char ULP_ENABLE[]; | |||
490 | /* Layer 2 defintions */ | 490 | /* Layer 2 defintions */ |
491 | #define QETH_PROT_LAYER2 0x08 | 491 | #define QETH_PROT_LAYER2 0x08 |
492 | #define QETH_PROT_TCPIP 0x03 | 492 | #define QETH_PROT_TCPIP 0x03 |
493 | #define QETH_PROT_OSN2 0x0a | 493 | #define QETH_PROT_OSN2 0x0a |
494 | #define QETH_ULP_ENABLE_PROT_TYPE(buffer) (buffer+0x50) | 494 | #define QETH_ULP_ENABLE_PROT_TYPE(buffer) (buffer+0x50) |
495 | #define QETH_IPA_CMD_PROT_TYPE(buffer) (buffer+0x19) | 495 | #define QETH_IPA_CMD_PROT_TYPE(buffer) (buffer+0x19) |
496 | 496 | ||
diff --git a/drivers/s390/net/qeth_proc.c b/drivers/s390/net/qeth_proc.c index 360d782c7ada..66f2da14e6e3 100644 --- a/drivers/s390/net/qeth_proc.c +++ b/drivers/s390/net/qeth_proc.c | |||
@@ -36,7 +36,7 @@ qeth_procfile_seq_start(struct seq_file *s, loff_t *offset) | |||
36 | { | 36 | { |
37 | struct device *dev = NULL; | 37 | struct device *dev = NULL; |
38 | loff_t nr = 0; | 38 | loff_t nr = 0; |
39 | 39 | ||
40 | down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem); | 40 | down_read(&qeth_ccwgroup_driver.driver.bus->subsys.rwsem); |
41 | if (*offset == 0) | 41 | if (*offset == 0) |
42 | return SEQ_START_TOKEN; | 42 | return SEQ_START_TOKEN; |
@@ -60,8 +60,8 @@ static void * | |||
60 | qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset) | 60 | qeth_procfile_seq_next(struct seq_file *s, void *it, loff_t *offset) |
61 | { | 61 | { |
62 | struct device *prev, *next; | 62 | struct device *prev, *next; |
63 | 63 | ||
64 | if (it == SEQ_START_TOKEN) | 64 | if (it == SEQ_START_TOKEN) |
65 | prev = NULL; | 65 | prev = NULL; |
66 | else | 66 | else |
67 | prev = (struct device *) it; | 67 | prev = (struct device *) it; |
@@ -180,7 +180,7 @@ qeth_perf_procfile_seq_show(struct seq_file *s, void *it) | |||
180 | struct device *device; | 180 | struct device *device; |
181 | struct qeth_card *card; | 181 | struct qeth_card *card; |
182 | 182 | ||
183 | 183 | ||
184 | if (it == SEQ_START_TOKEN) | 184 | if (it == SEQ_START_TOKEN) |
185 | return 0; | 185 | return 0; |
186 | 186 | ||
diff --git a/drivers/s390/net/qeth_sys.c b/drivers/s390/net/qeth_sys.c index 882d419e4160..185a9cfbcbdc 100644 --- a/drivers/s390/net/qeth_sys.c +++ b/drivers/s390/net/qeth_sys.c | |||
@@ -785,7 +785,7 @@ qeth_dev_large_send_store(struct device *dev, struct device_attribute *attr, con | |||
785 | } | 785 | } |
786 | if (card->options.large_send == type) | 786 | if (card->options.large_send == type) |
787 | return count; | 787 | return count; |
788 | if ((rc = qeth_set_large_send(card, type))) | 788 | if ((rc = qeth_set_large_send(card, type))) |
789 | return rc; | 789 | return rc; |
790 | return count; | 790 | return count; |
791 | } | 791 | } |
@@ -1682,7 +1682,7 @@ qeth_create_device_attributes(struct device *dev) | |||
1682 | if (card->info.type == QETH_CARD_TYPE_OSN) | 1682 | if (card->info.type == QETH_CARD_TYPE_OSN) |
1683 | return sysfs_create_group(&dev->kobj, | 1683 | return sysfs_create_group(&dev->kobj, |
1684 | &qeth_osn_device_attr_group); | 1684 | &qeth_osn_device_attr_group); |
1685 | 1685 | ||
1686 | if ((ret = sysfs_create_group(&dev->kobj, &qeth_device_attr_group))) | 1686 | if ((ret = sysfs_create_group(&dev->kobj, &qeth_device_attr_group))) |
1687 | return ret; | 1687 | return ret; |
1688 | if ((ret = sysfs_create_group(&dev->kobj, &qeth_device_ipato_group))){ | 1688 | if ((ret = sysfs_create_group(&dev->kobj, &qeth_device_ipato_group))){ |
@@ -1713,7 +1713,7 @@ qeth_remove_device_attributes(struct device *dev) | |||
1713 | if (card->info.type == QETH_CARD_TYPE_OSN) | 1713 | if (card->info.type == QETH_CARD_TYPE_OSN) |
1714 | return sysfs_remove_group(&dev->kobj, | 1714 | return sysfs_remove_group(&dev->kobj, |
1715 | &qeth_osn_device_attr_group); | 1715 | &qeth_osn_device_attr_group); |
1716 | 1716 | ||
1717 | sysfs_remove_group(&dev->kobj, &qeth_device_attr_group); | 1717 | sysfs_remove_group(&dev->kobj, &qeth_device_attr_group); |
1718 | sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group); | 1718 | sysfs_remove_group(&dev->kobj, &qeth_device_ipato_group); |
1719 | sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group); | 1719 | sysfs_remove_group(&dev->kobj, &qeth_device_vipa_group); |
diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h index 1286ddea450b..24ef40ca9562 100644 --- a/drivers/s390/net/qeth_tso.h +++ b/drivers/s390/net/qeth_tso.h | |||
@@ -117,11 +117,11 @@ __qeth_fill_buffer_frag(struct sk_buff *skb, struct qdio_buffer *buffer, | |||
117 | int fragno; | 117 | int fragno; |
118 | unsigned long addr; | 118 | unsigned long addr; |
119 | int element, cnt, dlen; | 119 | int element, cnt, dlen; |
120 | 120 | ||
121 | fragno = skb_shinfo(skb)->nr_frags; | 121 | fragno = skb_shinfo(skb)->nr_frags; |
122 | element = *next_element_to_fill; | 122 | element = *next_element_to_fill; |
123 | dlen = 0; | 123 | dlen = 0; |
124 | 124 | ||
125 | if (is_tso) | 125 | if (is_tso) |
126 | buffer->element[element].flags = | 126 | buffer->element[element].flags = |
127 | SBAL_FLAGS_MIDDLE_FRAG; | 127 | SBAL_FLAGS_MIDDLE_FRAG; |