s390 (4/10): network driver fixes.
Subsystems (4)
PATCH 1/1 s390 (4/10): network driver fixes.
network driver fixes:
- Use SET_NETDEV_DEV to create the link from the network device to the physical device. Remove link from physical to network device.
- Remove some unnecessary casts in netiucv.
- Add missing strings to dev_stat_names & dev_event_names.
- Add missing preempt_disable/preempt_enable pairs in iucv.
- Allow to change the peer username in netiucv.
diffstat:
drivers/s390/net/ctcmain.c | 27 ++------- drivers/s390/net/iucv.c | 16 +++-- drivers/s390/net/lcs.c | 22 +------ drivers/s390/net/netiucv.c | 130 +++++++++++++++++++++++++++++---------------- drivers/s390/net/qeth.c | 17 ----- 5 files changed, 107 insertions(+), 105 deletions(-)
drivers/s390/net/ctcmain.c +6 -21
@@ -1,5 +1,5 @@/* -* $Id: ctcmain.c,v 1.56 2004/02/27 17:53:26 mschwide Exp $ +* $Id: ctcmain.c,v 1.57 2004/03/02 15:34:01 mschwide Exp $ * * CTC / ESCON network driver *
@@ -36,7 +36,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* RELEASE-TAG: CTC/ESCON network driver $Revision: 1.56 $ +* RELEASE-TAG: CTC/ESCON network driver $Revision: 1.57 $ * */
@@ -319,7 +319,7 @@print_banner (void) {static int printed =0 ; -char vbuf[] ="$Revision: 1.56 $" ; +char vbuf[] ="$Revision: 1.57 $" ;char *version = vbuf;if (printed)
@@ -3043,26 +3043,13 @@ privptr->channel[direction]->protocol = privptr->protocol; privptr->channel[direction]->max_bufsize =CTC_BUFSIZE_DEFAULT ; } +/* sysfs magic */ +SET_NETDEV_DEV (dev, &cgdev->dev); +if (ctc_netdev_register (dev) !=0 ) {ctc_free_netdevice (dev,1 ); goto out; } -/* Create symlinks. */ -if (sysfs_create_link (&cgdev->dev.kobj, &dev->class_dev.kobj, - dev->name)) { -ctc_netdev_unregister (dev); - dev->priv =0 ; -ctc_free_netdevice (dev,1 ); - goto out; - } -if (sysfs_create_link (&dev->class_dev.kobj, &cgdev->dev.kobj, - cgdev->dev.bus_id)) { -sysfs_remove_link (&cgdev->dev.kobj, dev->name); -ctc_netdev_unregister (dev); - dev->priv =0 ; -ctc_free_netdevice (dev,1 ); - goto out; - }ctc_add_attributes (&cgdev->dev);
@@ -3118,8 +3105,6 @@channel_free (priv->channel[WRITE ]);if (ndev) { -sysfs_remove_link (&ndev->class_dev.kobj, cgdev->dev.bus_id); -sysfs_remove_link (&cgdev->dev.kobj, ndev->name);ctc_netdev_unregister (ndev); ndev->priv =NULL ;ctc_free_netdevice (ndev,1 );
drivers/s390/net/iucv.c +9 -7
@@ -1,5 +1,5 @@/* -* $Id: iucv.c,v 1.24 2004/02/05 14:16:01 braunu Exp $ +* $Id: iucv.c,v 1.26 2004/03/10 11:55:31 braunu Exp $ * * IUCV network driver *
@@ -29,7 +29,7 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * -* RELEASE-TAG: IUCV lowlevel driver $Revision: 1.24 $ +* RELEASE-TAG: IUCV lowlevel driver $Revision: 1.26 $ * */
@@ -351,7 +351,7 @@static void iucv_banner (void ) { -char vbuf[] ="$Revision: 1.24 $" ; +char vbuf[] ="$Revision: 1.26 $" ;char *version = vbuf;if ((version =strchr (version,':' ))) {
@@ -670,10 +670,12 @@ulong b2f0_result =0x0deadbeef ;iucv_debug (1 ,"entering" ); +preempt_disable ();if (smp_processor_id () ==0 )iucv_declare_buffer_cpu0 (&b2f0_result);else smp_call_function (iucv_declare_buffer_cpu0, &b2f0_result,0 ,1 ); +preempt_enable ();iucv_debug (1 ,"Address of EIB = %p" , iucv_external_int_buffer);if (b2f0_result ==0x0deadbeef ) b2f0_result =0xaa ;
@@ -692,11 +694,13 @@ {iucv_debug (1 ,"entering" );if (declare_flag) { +preempt_disable ();if (smp_processor_id () ==0 )iucv_retrieve_buffer_cpu0 (0 );else smp_call_function (iucv_retrieve_buffer_cpu0,0 ,0 ,1 ); declare_flag =0 ; +preempt_enable (); }iucv_debug (1 ,"exiting" );return 0 ;
@@ -2216,10 +2220,12 @@ } u; u.param = SetMaskFlag; +preempt_disable ();if (smp_processor_id () ==0 )iucv_setmask_cpu0 (&u);else smp_call_function (iucv_setmask_cpu0, &u,0 ,1 ); +preempt_enable ();return u.result; }
@@ -2519,10 +2525,6 @@/** * Export all public stuff -* FIXME: I have commented out all the functions that -* are not used in netiucv. Is anyone else -* using them or should some of them be made -* static / removed? pls review. Arnd */ EXPORT_SYMBOL (iucv_bus);EXPORT_SYMBOL (iucv_root);
drivers/s390/net/lcs.c +4 -18
@@ -11,7 +11,7 @@* Frank Pavlic ([email protected]) and * Martin Schwidefsky <[email protected]> * -* $Revision: 1.67 $ $Date: 2004/02/26 18:26:50 $ +* $Revision: 1.68 $ $Date: 2004/03/02 15:34:01 $ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by
@@ -58,7 +58,7 @@/** * initialization string for output */ -#define VERSION_LCS_C "$Revision: 1.67 $" +#define VERSION_LCS_C "$Revision: 1.68 $"static char version[]__initdata ="LCS driver (" VERSION_LCS_C "/" VERSION_LCS_H ")" ;
@@ -1855,17 +1855,8 @@if (register_netdev (dev) !=0 ) goto out;/* Create symlinks. */ -if (sysfs_create_link (&ccwgdev->dev.kobj, &dev->class_dev.kobj, - dev->name)) { -unregister_netdev (dev); - goto out; - } -if (sysfs_create_link (&dev->class_dev.kobj, &ccwgdev->dev.kobj, - ccwgdev->dev.bus_id)) { -sysfs_remove_link (&ccwgdev->dev.kobj, dev->name); -unregister_netdev (dev); - goto out; - } +SET_NETDEV_DEV (dev, &ccwgdev->dev); +netif_stop_queue (dev);lcs_stopcard (card);return 0 ;
@@ -1891,8 +1882,6 @@ ret =lcs_stop_device (card->dev);if (ret)return ret; -sysfs_remove_link (&card->dev->class_dev.kobj, ccwgdev->dev.bus_id); -sysfs_remove_link (&ccwgdev->dev.kobj, card->dev->name);unregister_netdev (card->dev);return 0 ; }
@@ -1911,9 +1900,6 @@return ;if (ccwgdev->state ==CCWGROUP_ONLINE ) {lcs_stop_device (card->dev);/* Ignore rc. */ -sysfs_remove_link (&card->dev->class_dev.kobj, - ccwgdev->dev.bus_id); -sysfs_remove_link (&ccwgdev->dev.kobj, card->dev->name);unregister_netdev (card->dev); }sysfs_remove_group (&ccwgdev->dev.kobj, &lcs_attr_group);
drivers/s390/net/netiucv.c +86 -44
248 lines not on this page · raw message
drivers/s390/net/qeth.c +2 -15
@@ -6404,6 +6404,8 @@QETH_DBF_CARD3 (0 , trace,"rgnd" , card); +/* sysfs magic */ +SET_NETDEV_DEV (card->dev, &card->gdev->dev); result =register_netdev (card->dev);return result;
@@ -6681,10 +6683,6 @@hard_start_xmit */ if (atomic_read (&card->is_registered)) { -/* Remove sysfs symlinks. */ -sysfs_remove_link (&card->gdev->dev.kobj, card->dev_name); -sysfs_remove_link (&card->dev->class_dev.kobj, -CARD_BUS_ID (card));QETH_DBF_TEXT2 (0 , trace,"unregdev" );qeth_unregister_netdev (card);qeth_wait_nonbusy (QETH_REMOVE_WAIT_TIME );
@@ -10694,17 +10692,6 @@if (qeth_init_netdev (card)) goto out_remove; -if (sysfs_create_link (&card->gdev->dev.kobj, &card->dev->class_dev.kobj, - card->dev_name)) { -qeth_unregister_netdev (card); - goto out_remove; - } -if (sysfs_create_link (&card->dev->class_dev.kobj, &card->gdev->dev.kobj, -CARD_BUS_ID (card))) { -sysfs_remove_link (&card->gdev->dev.kobj, card->dev_name); -qeth_unregister_netdev (card); - goto out_remove; - }return 0 ;/* success */ out_remove: