[PATCH] s390: network driver fixes.

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

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.

diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 82c26c81b47993bf8b4a5e13353085d95f148a96..d2498ec66ff04a65ac5f3489c0a22168ae7f8860 100644 (file)
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -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 $
  *
  */
 \f
@@ -319,7 +319,7 @@ static void
 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 @@ ctc_new_device(struct ccwgroup_device *cgdev)
                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 @@ ctc_shutdown_device(struct ccwgroup_device *cgdev)
                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);

diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index b1b62823c2e641aa8afd0d09c260515e66656ad0..6e28005cc84b3334fb2ac9a6a3992f48ce6e4ee5 100644 (file)
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -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 $
  *
  */
 \f
@@ -351,7 +351,7 @@ do { \
 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 @@ iucv_declare_buffer (void)
        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_retrieve_buffer (void)
 {
        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 @@ iucv_setmask (int SetMaskFlag)
        } 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 @@ module_exit(iucv_exit);
 
 /**
  * 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);

diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index df19bf960c2ee3727c8ebbafe264d32bc5dc5452..4fc524077b3f15f6565a8fbc4068e1fb487e5045 100644 (file)
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -11,7 +11,7 @@
  *                       Frank Pavlic (pavlic@de.ibm.com) and
  *                       Martin Schwidefsky <schwidefsky@de.ibm.com>
  *
- *    $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 @@ lcs_new_device(struct ccwgroup_device *ccwgdev)
        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 @@ lcs_shutdown_device(struct ccwgroup_device *ccwgdev)
        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 @@ lcs_remove_device(struct ccwgroup_device *ccwgdev)
                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);

diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 2ea792784713125a19b68208497ff3e9a401293c..1e57b4cef3eda0af67faa526477d9d110adbf02c 100644 (file)
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1,5 +1,5 @@
 /*
- * $Id: netiucv.c,v 1.38 2004/02/19 13:12:57 mschwide Exp $
+ * $Id: netiucv.c,v 1.45 2004/03/15 08:48:48 braunu Exp $
  *
  * IUCV network driver
  *
@@ -30,7 +30,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * RELEASE-TAG: IUCV network driver $Revision: 1.38 $
+ * RELEASE-TAG: IUCV network driver $Revision: 1.45 $
  *
  */
 \f
@@ -229,6 +229,7 @@ static const char *dev_state_names[] = {
        "StartWait",
        "StopWait",
        "Running",
+       "StartRetry",
 };
 
 /**
@@ -251,6 +252,7 @@ static const char *dev_event_names[] = {
        "Stop",
        "Connection up",
        "Connection down",
+       "Timer",
 };
 \f
 /**
@@ -344,11 +346,6 @@ enum conn_states {
         */
        CONN_STATE_TX,
 
-       /**
-        * Terminating
-        */
-       CONN_STATE_TERM,
-
        /**
         * Error during registration.
         */
@@ -495,7 +492,7 @@ static void
 netiucv_unpack_skb(struct iucv_connection *conn, struct sk_buff *pskb)
 {
        struct net_device     *dev = conn->netdev;
-       struct netiucv_priv   *privptr = (struct netiucv_priv *)dev->priv;
+       struct netiucv_priv   *privptr = dev->priv;
        __u16          offset = 0;
 
        skb_put(pskb, NETIUCV_HDRLEN);
@@ -1214,7 +1211,7 @@ netiucv_close(struct net_device *dev) {
 static int netiucv_tx(struct sk_buff *skb, struct net_device *dev)
 {
        int          rc = 0;
-       struct netiucv_priv *privptr = (struct netiucv_priv *)dev->priv;
+       struct netiucv_priv *privptr = dev->priv;
 
        /**
         * Some sanity checks ...
@@ -1290,7 +1287,6 @@ netiucv_change_mtu (struct net_device * dev, int new_mtu)
 /**
  * attributes in sysfs
  *****************************************************************************/
-#define CTRL_BUFSIZE 40
 
 static ssize_t
 user_show (struct device *dev, char *buf)
@@ -1300,7 +1296,57 @@ user_show (struct device *dev, char *buf)
        return sprintf(buf, "%s\n", netiucv_printname(priv->conn->userid));
 }
 
-static DEVICE_ATTR(user, 0444, user_show, NULL);
+static ssize_t
+user_write (struct device *dev, const char *buf, size_t count)
+{
+       struct netiucv_priv *priv = dev->driver_data;
+       struct net_device *ndev = priv->conn->netdev;
+       char    *p;
+       char    *tmp;
+       char    username[10];
+       int     i;
+
+       if (count>9) {
+               printk(KERN_WARNING
+                       "netiucv: username too long (%d)!\n", (int)count);
+               return -EINVAL;
+       }
+
+       tmp = strsep((char **) &buf, "\n");
+       for (i=0, p=tmp; i<8 && *p; i++, p++) {
+               if (isalnum(*p) || (*p == '$'))
+                       username[i]= *p;
+               else if (*p == '\n') {
+                       /* trailing lf, grr */
+                       break;
+               } else {
+                       printk(KERN_WARNING
+                               "netiucv: Invalid character in username!\n");
+                       return -EINVAL;
+               }
+       }
+       while (i<9)
+               username[i++] = ' ';
+       username[9] = '\0';
+
+       if (memcmp(username, priv->conn->userid, 8) != 0) {
+               /* username changed */
+               if (ndev->flags & (IFF_UP | IFF_RUNNING)) {
+                       printk(KERN_WARNING
+                               "netiucv: device %s active, connected to %s\n",
+                               dev->bus_id, priv->conn->userid);
+                       printk(KERN_WARNING
+                               "netiucv: user cannot be updated\n");
+                       return -EBUSY;
+               }
+       }
+       memcpy(priv->conn->userid, username, 9);
+
+       return count;
+
+}
+
+static DEVICE_ATTR(user, 0644, user_show, user_write);
 
 static ssize_t
 buffer_show (struct device *dev, char *buf)
@@ -1317,26 +1363,30 @@ buffer_write (struct device *dev, const char *buf, size_t count)
        struct net_device *ndev = priv->conn->netdev;
        char         *e;
        int          bs1;
-       char         tmp[CTRL_BUFSIZE];
 
        if (count >= 39)
                return -EINVAL;
 
-       if (copy_from_user(tmp, buf, count))
-                return -EFAULT;
-       tmp[count+1] = '\0';
-       bs1 = simple_strtoul(tmp, &e, 0);
+       bs1 = simple_strtoul(buf, &e, 0);
+
+       if (e && (!isspace(*e))) {
+               printk(KERN_WARNING
+                       "netiucv: Invalid character in buffer!\n");
+               return -EINVAL;
+       }
+       if (bs1 > NETIUCV_BUFSIZE_MAX) {
+               printk(KERN_WARNING
+                       "netiucv: Given buffer size %d too large.\n",
+                       bs1);
 
-       if ((bs1 > NETIUCV_BUFSIZE_MAX) ||
-           (e && (!isspace(*e))))
                return -EINVAL;
+       }
        if ((ndev->flags & IFF_RUNNING) &&
            (bs1 < (ndev->mtu + NETIUCV_HDRLEN + 2)))
                return -EINVAL;
        if (bs1 < (576 + NETIUCV_HDRLEN + NETIUCV_HDRLEN))
                return -EINVAL;
 
-
        priv->conn->max_buffsize = bs1;
        if (!(ndev->flags & IFF_RUNNING))
                ndev->mtu = bs1 - NETIUCV_HDRLEN - NETIUCV_HDRLEN;
@@ -1606,20 +1656,10 @@ netiucv_register_device(struct net_device *ndev, int ifno)
        ret = netiucv_add_files(dev);
        if (ret)
                goto out_unreg;
-       ret = sysfs_create_link(&dev->kobj, &ndev->class_dev.kobj, ndev->name);
-       if (ret) 
-               goto out_rm_files;
-       ret = sysfs_create_link(&ndev->class_dev.kobj, &dev->kobj, dev->bus_id);
-       if (ret)
-               goto out_rm_link;
        dev->driver_data = priv;
        priv->dev = dev;
        return 0;
 
-out_rm_link:
-       sysfs_remove_link(&dev->kobj, ndev->name);
-out_rm_files:
-       netiucv_remove_files(dev);
 out_unreg:
        device_unregister(dev);
        return ret;
@@ -1628,12 +1668,7 @@ out_unreg:
 static void
 netiucv_unregister_device(struct device *dev)
 {
-       struct netiucv_priv *priv = dev->driver_data;
-       struct net_device *ndev = priv->conn->netdev;
-
        pr_debug("%s() called\n", __FUNCTION__);
-       sysfs_remove_link(&ndev->class_dev.kobj, dev->bus_id);
-       sysfs_remove_link(&dev->kobj, ndev->name);
        netiucv_remove_files(dev);
        device_unregister(dev);
 }
@@ -1814,7 +1849,7 @@ conn_write(struct device_driver *drv, const char *buf, size_t count)
 {
        char *p;
        char username[10];
-       int i;
+       int i, ret;
        struct net_device *dev;
 
        if (count>9) {
@@ -1846,30 +1881,37 @@ conn_write(struct device_driver *drv, const char *buf, size_t count)
                return -ENODEV;
        }
        
-       if (register_netdev(dev)) {
-               printk(KERN_WARNING
-                      "netiucv: Could not register '%s'\n", dev->name);
-               netiucv_free_netdevice(dev);
-               return -ENODEV;
+       if ((ret = netiucv_register_device(dev, ifno)))
+               goto out_free_ndev;
+       /* sysfs magic */
+       SET_NETDEV_DEV(dev, (struct device*)((struct netiucv_priv*)dev->priv)->dev);
+       if ((ret = register_netdev(dev))) {
+               netiucv_unregister_device((struct device*)((struct netiucv_priv*)dev->priv)->dev);
+               goto out_free_ndev;
        }
        printk(KERN_INFO "%s: '%s'\n", dev->name, netiucv_printname(username));
-       netiucv_register_device(dev, ifno);
        ifno++;
        
        return count;
+
+out_free_ndev:
+       printk(KERN_WARNING
+                      "netiucv: Could not register '%s'\n", dev->name);
+       netiucv_free_netdevice(dev);
+       return ret;
 }
 
 DRIVER_ATTR(connection, 0200, NULL, conn_write);
 
 static struct device_driver netiucv_driver = {
-       .name = "NETIUCV",
+       .name = "netiucv",
        .bus  = &iucv_bus,
 };
 
 static void
 netiucv_banner(void)
 {
-       char vbuf[] = "$Revision: 1.38 $";
+       char vbuf[] = "$Revision: 1.45 $";
        char *version = vbuf;
 
        if ((version = strchr(version, ':'))) {

diff --git a/drivers/s390/net/qeth.c b/drivers/s390/net/qeth.c
index 709fe063eb269131e1dad6dde585c38063625405..8b74cf6b7c5c6592b9e25ad94622dbaaf9e2f2d5 100644 (file)
--- a/drivers/s390/net/qeth.c
+++ b/drivers/s390/net/qeth.c
@@ -6404,6 +6404,8 @@ qeth_register_netdev(struct qeth_card *card)
 
        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 @@ qeth_remove_card(struct qeth_card *card, int method)
                                                   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 @@ qeth_activate(struct qeth_card *card)
        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: