patch-2.0.37 linux/drivers/net/sdla.c

Next file: linux/drivers/net/skeleton.c
Previous file: linux/drivers/net/rtl8139.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.0.36/linux/drivers/net/sdla.c linux/drivers/net/sdla.c
@@ -452,7 +452,7 @@
          save_flags(pflags);
          cli();
          SDLA_WINDOW(dev, window);
-         waiting = ((volatile)(cmd_buf->opp_flag));
+         waiting = ((volatile int)(cmd_buf->opp_flag));
          restore_flags(pflags);
       }
    }
@@ -566,11 +566,12 @@
    flp->dlci[i] = -*(short *)(master->dev_addr);
    master->mtu = slave->mtu;
 
-   if (slave->start)
+   if (slave->start) {
       if (flp->config.station == FRAD_STATION_CPE)
          sdla_reconfig(slave);
       else
          sdla_cmd(slave, SDLA_ADD_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL);
+   }
 
    return(0);
 }
@@ -594,11 +595,12 @@
 
    MOD_DEC_USE_COUNT;
 
-   if (slave->start)
+   if (slave->start) {
       if (flp->config.station == FRAD_STATION_CPE)
          sdla_reconfig(slave);
       else
          sdla_cmd(slave, SDLA_DELETE_DLCI, 0, 0, master->dev_addr, sizeof(short), NULL, NULL);
+   }
 
    return(0);
 }
@@ -623,13 +625,14 @@
 
    ret = SDLA_RET_OK;
    len = sizeof(struct dlci_conf);
-   if (slave->start)
+   if (slave->start) {
       if (get)
          ret = sdla_cmd(slave, SDLA_READ_DLCI_CONFIGURATION, abs(flp->dlci[i]), 0,  
                      NULL, 0, &dlp->config, &len);
       else
          ret = sdla_cmd(slave, SDLA_SET_DLCI_CONFIGURATION, abs(flp->dlci[i]), 0,  
                      &dlp->config, sizeof(struct dlci_conf) - 4 * sizeof(short), NULL, NULL);
+   }
 
    return(ret == SDLA_RET_OK ? 0 : -EIO);
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov