kernel: Fix various whitespace and indent issues (no functional change).

diff --git a/sys/boot/pc32/libi386/biosdisk.c b/sys/boot/pc32/libi386/biosdisk.c
index 8e47f3f..177be53 100644 (file)
--- a/sys/boot/pc32/libi386/biosdisk.c
+++ b/sys/boot/pc32/libi386/biosdisk.c
@@ -24,7 +24,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.45 2004/09/21 06:46:44 wes Exp $
- * $DragonFly: src/sys/boot/pc32/libi386/biosdisk.c,v 1.12 2007/06/18 05:13:42 dillon Exp $
  */
 
 /*
@@ -660,7 +659,7 @@ bd_opendisk(struct open_disk **odp, struct i386_devdesc *dev)
     if ((dptr->dp_typ == DOSPTYP_386BSD) && (dev->d_kind.biosdisk.partition < 0))
        dev->d_kind.biosdisk.partition = 0;
 
- unsliced:
+unsliced:
     /* 
      * Now we have the slice offset, look for the partition in the disklabel if we have
      * a partition to start with.

diff --git a/sys/bus/cam/scsi/scsi_all.c b/sys/bus/cam/scsi/scsi_all.c
index f709b55..4a5d441 100644 (file)
--- a/sys/bus/cam/scsi/scsi_all.c
+++ b/sys/bus/cam/scsi/scsi_all.c
@@ -3239,13 +3239,10 @@ scsi_sense_sbuf(struct cam_device *device, struct ccb_scsiio *csio,
                                        ksnprintf(tmpstr2, sizeof(tmpstr2),
                                                 "bit %d",
                                                sense->sense_key_spec[0] & 0x7);
-                                       sbuf_printf(sb,
-                                                  ": %s byte %d %s is invalid",
-                                                   bad_command ?
-                                                   "Command" : "Data",
-                                                   scsi_2btoul(
-                                                   &sense->sense_key_spec[1]),
-                                                   tmpstr2);
+                               sbuf_printf(sb, ": %s byte %d %s is invalid",
+                                   bad_command ? "Command" : "Data",
+                                   scsi_2btoul(&sense->sense_key_spec[1]),
+                                   tmpstr2);
                                break;
                        }
                        case SSD_KEY_RECOVERED_ERROR:

diff --git a/sys/bus/ppbus/ppb_base.c b/sys/bus/ppbus/ppb_base.c
index f2e6de3..882edbc 100644 (file)
--- a/sys/bus/ppbus/ppb_base.c
+++ b/sys/bus/ppbus/ppb_base.c
@@ -24,9 +24,8 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ppbus/ppb_base.c,v 1.10.2.1 2000/08/01 23:26:26 n_hibma Exp $
- * $DragonFly: src/sys/bus/ppbus/ppb_base.c,v 1.5 2003/08/07 21:16:47 dillon Exp $
- *
  */
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
@@ -135,8 +134,8 @@ ppb_set_mode(device_t bus, int mode)
        if (PPBUS_SETMODE(device_get_parent(bus), mode))
                return -1;
 
-               /* XXX yet device mode = ppbus mode = chipset mode */
-               ppb->mode = (mode & PPB_MASK);
+       /* XXX yet device mode = ppbus mode = chipset mode */
+       ppb->mode = (mode & PPB_MASK);
 
        return (old_mode);
 }

diff --git a/sys/bus/usb/usb_subr.c b/sys/bus/usb/usb_subr.c
index fbb9839..71bb730 100644 (file)
--- a/sys/bus/usb/usb_subr.c
+++ b/sys/bus/usb/usb_subr.c
@@ -1111,7 +1111,7 @@ usbd_reload_device_desc(usbd_device_handle dev)
                err = usbd_get_device_desc(dev, &dev->ddesc);
                if (!err)
                        break;
-               usbd_delay_ms(dev, 200);
+               usbd_delay_ms(dev, 200);
        }
        if (err)
                return (err);

diff --git a/sys/dev/acpica5/acpi_resource.c b/sys/dev/acpica5/acpi_resource.c
index 43fc595..7ca3984 100644 (file)
--- a/sys/dev/acpica5/acpi_resource.c
+++ b/sys/dev/acpica5/acpi_resource.c
@@ -717,8 +717,8 @@ acpi_sysres_attach(device_t dev)
     dev_rl = BUS_GET_RESOURCE_LIST(bus, dev);
     bus_rl = BUS_GET_RESOURCE_LIST(device_get_parent(bus), bus);
     if(bus_rl)
-        kprintf("busrl is not null!\n");
-        SLIST_FOREACH(dev_rle, dev_rl, link) {
+       kprintf("busrl is not null!\n");
+       SLIST_FOREACH(dev_rle, dev_rl, link) {
        if (dev_rle->type != SYS_RES_IOPORT && dev_rle->type != SYS_RES_MEMORY)
            continue;
 

diff --git a/sys/dev/disk/aic7xxx/aic7xxx.c b/sys/dev/disk/aic7xxx/aic7xxx.c
index 05c1fef..f4f041f 100644 (file)
--- a/sys/dev/disk/aic7xxx/aic7xxx.c
+++ b/sys/dev/disk/aic7xxx/aic7xxx.c
@@ -40,7 +40,6 @@
  * $Id: //depot/aic7xxx/aic7xxx/aic7xxx.c#155 $
  *
  * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx.c,v 1.111 2007/04/19 18:53:52 scottl Exp $
- * $DragonFly: src/sys/dev/disk/aic7xxx/aic7xxx.c,v 1.29 2008/05/18 20:30:21 pavalos Exp $
  */
 
 #include "aic7xxx_osm.h"
@@ -1740,7 +1739,7 @@ ahc_find_syncrate(struct ahc_softc *ahc, u_int *period,
                         * At some speeds, we only support
                         * ST transfers.
                         */
-                       if ((syncrate->sxfr_u2 & ST_SXFR) != 0)
+                       if ((syncrate->sxfr_u2 & ST_SXFR) != 0)
                                *ppr_options &= ~MSG_EXT_PPR_DT_REQ;
                        break;
                }

diff --git a/sys/dev/disk/iscsi/initiator/isc_sm.c b/sys/dev/disk/iscsi/initiator/isc_sm.c
index 3e0238f..fd689ab 100644 (file)
--- a/sys/dev/disk/iscsi/initiator/isc_sm.c
+++ b/sys/dev/disk/iscsi/initiator/isc_sm.c
@@ -324,7 +324,7 @@ isc_qout(isc_session_t *sp, pduq_t *pq)
      iscsi_lock_ex(&sp->io_mtx);
      sp->flags |= ISC_OQNOTEMPTY;
      if(sp->flags & ISC_OWAITING)
-     wakeup(&sp->flags);
+         wakeup(&sp->flags);
      iscsi_unlock_ex(&sp->io_mtx);
 
      return error;

diff --git a/sys/dev/disk/stg/tmc18c30.c b/sys/dev/disk/stg/tmc18c30.c
index e84e158..e367492 100644 (file)
--- a/sys/dev/disk/stg/tmc18c30.c
+++ b/sys/dev/disk/stg/tmc18c30.c
@@ -1,5 +1,4 @@
 /*     $FreeBSD: src/sys/dev/stg/tmc18c30.c,v 1.1.2.5 2001/12/17 13:30:19 non Exp $    */
-/*     $DragonFly: src/sys/dev/disk/stg/tmc18c30.c,v 1.14 2007/01/06 08:33:34 dillon Exp $     */
 /*     $NecBSD: tmc18c30.c,v 1.28.12.3 2001/06/19 04:35:48 honda Exp $ */
 /*     $NetBSD$        */
 
@@ -360,7 +359,7 @@ stg_msg(struct stg_softc *sc, struct targ_info *ti, u_int msg)
        if ((msg & SCSI_LOW_MSG_SYNCH) == 0)
                return 0;
 
-       period = ti->ti_maxsynch.period;
+       period = ti->ti_maxsynch.period;
        offset = ti->ti_maxsynch.offset;
        period = period << 2;
        if (period >= 200)

diff --git a/sys/dev/netif/ar/if_ar.c b/sys/dev/netif/ar/if_ar.c
index 9117f12..331acfb 100644 (file)
--- a/sys/dev/netif/ar/if_ar.c
+++ b/sys/dev/netif/ar/if_ar.c
@@ -1384,8 +1384,8 @@ ar_init_rx_dmac(struct ar_softc *sc)
 
                x++;
                if(x < 6)
-               TRC(kprintf("Descrp %p, data pt %x, data %x, ",
-                       rxd, rxda, rxbuf));
+                       TRC(kprintf("Descrp %p, data pt %x, data %x, ",
+                           rxd, rxda, rxbuf));
 
                rxd->bp = (u_short)(rxbuf & 0xfffful);
                rxd->bpb = (u_char)((rxbuf >> 16) & 0xff);

diff --git a/sys/dev/netif/cs/if_cs.c b/sys/dev/netif/cs/if_cs.c
index 1de4a5a..7657905 100644 (file)
--- a/sys/dev/netif/cs/if_cs.c
+++ b/sys/dev/netif/cs/if_cs.c
@@ -25,7 +25,6 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/cs/if_cs.c,v 1.19.2.1 2001/01/25 20:13:48 imp Exp $
- * $DragonFly: src/sys/dev/netif/cs/if_cs.c,v 1.30 2008/08/17 04:32:33 sephe Exp $
  */
 
 /*
@@ -956,7 +955,7 @@ cs_write_mbufs( struct cs_softc *sc, struct mbuf *m )
                 * Ignore empty parts
                 */
                if (!len)
-               continue;
+                       continue;
 
                /*
                 * Find actual data address

diff --git a/sys/dev/netif/ep/if_ep_isa.c b/sys/dev/netif/ep/if_ep_isa.c
index 8bba0e8..7a75677 100644 (file)
--- a/sys/dev/netif/ep/if_ep_isa.c
+++ b/sys/dev/netif/ep/if_ep_isa.c
@@ -123,10 +123,11 @@ const char *
 ep_isa_match_id(u_int32_t id, struct isa_ident *isa_devs)
 {
        struct isa_ident *      i = isa_devs;
+
        while(i->name != NULL) {
-              if (id == i->id)
-                     return (i->name);
-              i++;
+               if (id == i->id)
+                       return (i->name);
+               i++;
        }
        /*
         * If we see a card that is likely to be a 3c509

diff --git a/sys/dev/raid/amr/amr_cam.c b/sys/dev/raid/amr/amr_cam.c
index 46220d2..fe8ee2e 100644 (file)
--- a/sys/dev/raid/amr/amr_cam.c
+++ b/sys/dev/raid/amr/amr_cam.c
@@ -428,7 +428,7 @@ amr_cam_command(struct amr_softc *sc, struct amr_command **acp)
 
        /* check to see if there is a ccb for us to work with */
        if ((csio = (struct ccb_scsiio *)amr_dequeue_ccb(sc)) == NULL)
-       goto out;
+               goto out;
 
        /* get bus/target, XXX validate against protected devices? */
        bus = csio->ccb_h.sim_priv.entries[0].field;

diff --git a/sys/dev/raid/asr/asr.c b/sys/dev/raid/asr/asr.c
index 05b9eb8..975d322 100644 (file)
--- a/sys/dev/raid/asr/asr.c
+++ b/sys/dev/raid/asr/asr.c
@@ -2062,11 +2062,12 @@ ASR_initOutBound (
 
                 /* Initialize the outbound FIFO */
                 if (sc->ha_Msgs != (PI2O_SCSI_ERROR_REPLY_MESSAGE_FRAME)NULL)
-                for (size = sc->ha_Msgs_Count, addr = sc->ha_Msgs_Phys;
-                  size; --size) {
-                        sc->ha_Virt->FromFIFO = addr;
-                        addr += sizeof(I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME);
-                }
+                       for (size = sc->ha_Msgs_Count, addr = sc->ha_Msgs_Phys;
+                            size; --size) {
+                               sc->ha_Virt->FromFIFO = addr;
+                               addr +=
+                                   sizeof(I2O_SCSI_ERROR_REPLY_MESSAGE_FRAME);
+                       }
                 return (*Reply_Ptr);
         }
         return (0);

diff --git a/sys/dev/sound/isa/mss.c b/sys/dev/sound/isa/mss.c
index bb66261..f822c94 100644 (file)
--- a/sys/dev/sound/isa/mss.c
+++ b/sys/dev/sound/isa/mss.c
@@ -270,7 +270,7 @@ mss_release_resources(struct mss_info *mss, device_t dev)
        if (mss->irq) {
                if (mss->ih)
                        bus_teardown_intr(dev, mss->irq, mss->ih);
-               bus_release_resource(dev, SYS_RES_IRQ, mss->irq_rid,
+               bus_release_resource(dev, SYS_RES_IRQ, mss->irq_rid,
                                     mss->irq);
                mss->irq = 0;
        }

diff --git a/sys/dev/sound/isa/sb16.c b/sys/dev/sound/isa/sb16.c
index b960f56..7eccfcc 100644 (file)
--- a/sys/dev/sound/isa/sb16.c
+++ b/sys/dev/sound/isa/sb16.c
@@ -434,7 +434,7 @@ sb16_release_resources(struct sb_info *sb, device_t dev)
        if (sb->irq) {
                if (sb->ih)
                        bus_teardown_intr(dev, sb->irq, sb->ih);
-               bus_release_resource(dev, SYS_RES_IRQ, 0, sb->irq);
+               bus_release_resource(dev, SYS_RES_IRQ, 0, sb->irq);
                sb->irq = 0;
        }
        if (sb->drq2) {

diff --git a/sys/dev/sound/isa/sb8.c b/sys/dev/sound/isa/sb8.c
index 096302d..d392cfd 100644 (file)
--- a/sys/dev/sound/isa/sb8.c
+++ b/sys/dev/sound/isa/sb8.c
@@ -262,7 +262,7 @@ sb_release_resources(struct sb_info *sb, device_t dev)
        if (sb->irq) {
                if (sb->ih)
                        bus_teardown_intr(dev, sb->irq, sb->ih);
-               bus_release_resource(dev, SYS_RES_IRQ, 0, sb->irq);
+               bus_release_resource(dev, SYS_RES_IRQ, 0, sb->irq);
                sb->irq = 0;
        }
        if (sb->drq) {

diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
index e1fafad..b783e05 100644 (file)
--- a/sys/dev/sound/pci/csa.c
+++ b/sys/dev/sound/pci/csa.c
@@ -930,7 +930,7 @@ csa_readcodec(csa_res *resp, u_long offset, u_int32_t *data)
                /*
                 * Wait for a short while.
                 */
-                DELAY(25);
+               DELAY(25);
        }
 
        /*

diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c
index 77f3f9e..a205843 100644 (file)
--- a/sys/dev/sound/pci/envy24ht.c
+++ b/sys/dev/sound/pci/envy24ht.c
@@ -818,7 +818,7 @@ envy24ht_gpiowr(struct sc_info *sc, u_int32_t data)
 #endif
        envy24ht_wrcs(sc, ENVY24HT_CCS_GPIO_LDATA, data, 2);
        if (sc->cfg->subdevice != 0x1150)
-       envy24ht_wrcs(sc, ENVY24HT_CCS_GPIO_HDATA, data >> 16, 1);
+               envy24ht_wrcs(sc, ENVY24HT_CCS_GPIO_HDATA, data >> 16, 1);
        return;
 }
 

diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 44542cb..a74f85e 100644 (file)
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -829,7 +829,7 @@ ich_calibrate(void *arg)
                device_printf(sc->dev, "measured ac97 link rate at %d Hz", actual_48k_rate);
                if (sc->ac97rate != actual_48k_rate)
                        kprintf(", will use %d Hz", sc->ac97rate);
-               kprintf("\n");
+               kprintf("\n");
        }
        sc->flags |= ICH_CALIBRATE_DONE;
        ICH_UNLOCK(sc);

diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c
index 2cf06d3..c1259b6 100644 (file)
--- a/sys/dev/sound/pci/neomagic.c
+++ b/sys/dev/sound/pci/neomagic.c
@@ -571,7 +571,7 @@ nm_init(struct sc_info *sc)
 
        if (bootverbose)
                device_printf(sc->dev, "buftop is 0x%08x\n", sc->buftop);
-       if ((nm_rdbuf(sc, ofs, 4) & NM_SIG_MASK) == NM_SIGNATURE) {
+       if ((nm_rdbuf(sc, ofs, 4) & NM_SIG_MASK) == NM_SIGNATURE) {
                i = nm_rdbuf(sc, ofs + 4, 4);
                if (i != 0 && i != 0xffffffff) {
                        if (bootverbose)

diff --git a/sys/dev/usbmisc/ugen/ugen.c b/sys/dev/usbmisc/ugen/ugen.c
index e087352..5729f1d 100644 (file)
--- a/sys/dev/usbmisc/ugen/ugen.c
+++ b/sys/dev/usbmisc/ugen/ugen.c
@@ -413,7 +413,7 @@ ugenopen(struct dev_open_args *ap)
        if (sc == NULL)
                return (ENXIO);
 
-       DPRINTFN(5, ("ugenopen: flag=%d, mode=%d, unit=%d endpt=%d\n",
+       DPRINTFN(5, ("ugenopen: flag=%d, mode=%d, unit=%d endpt=%d\n",
                     ap->a_oflags, ap->a_devtype, unit, endpt));
 
        if (sc->sc_dying)

diff --git a/sys/dev/usbmisc/uscanner/uscanner.c b/sys/dev/usbmisc/uscanner/uscanner.c
index f8b40b0..c4c8f60 100644 (file)
--- a/sys/dev/usbmisc/uscanner/uscanner.c
+++ b/sys/dev/usbmisc/uscanner/uscanner.c
@@ -390,7 +390,7 @@ uscanneropen(struct dev_open_args *ap)
        if (sc == NULL)
                return (ENXIO);
 
-       DPRINTFN(5, ("uscanneropen: flag=%d, mode=%d, unit=%d\n",
+       DPRINTFN(5, ("uscanneropen: flag=%d, mode=%d, unit=%d\n",
                     ap->a_oflags, ap->a_devtype, unit));
 
        if (sc->sc_dying)

diff --git a/sys/gnu/vfs/ext2fs/ext2_vnops.c b/sys/gnu/vfs/ext2fs/ext2_vnops.c
index 74ce07b..b5167be 100644 (file)
--- a/sys/gnu/vfs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/vfs/ext2fs/ext2_vnops.c
@@ -661,7 +661,7 @@ abortit:
                 * decrement the link count on the parent
                 * of the target directory.
                 */
-                if (doingdirectory && !newparent) {
+               if (doingdirectory && !newparent) {
                        dp->i_nlink--;
                        dp->i_flag |= IN_CHANGE;
                }

diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c
index a611180..5ccce8e 100644 (file)
--- a/sys/kern/kern_sig.c
+++ b/sys/kern/kern_sig.c
@@ -1769,7 +1769,7 @@ sys_sigtimedwait(struct sigtimedwait_args *uap)
        error = kern_sigtimedwait(set, &info, timeout);
        if (error)
                return (error);
-       if (uap->info)
+       if (uap->info)
                error = copyout(&info, uap->info, sizeof(info));
        /* Repost if we got an error. */
        /*

diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c
index d313c68..233dbe2 100644 (file)
--- a/sys/kern/kern_sysctl.c
+++ b/sys/kern/kern_sysctl.c
@@ -38,7 +38,6 @@
  *
  *     @(#)kern_sysctl.c       8.4 (Berkeley) 4/14/94
  * $FreeBSD: src/sys/kern/kern_sysctl.c,v 1.92.2.9 2003/05/01 22:48:09 trhodes Exp $
- * $DragonFly: src/sys/kern/kern_sysctl.c,v 1.30 2008/08/03 11:00:32 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -1216,7 +1215,7 @@ sys___sysctl(struct sysctl_args *uap)
        if (uap->namelen > CTL_MAXNAME || uap->namelen < 2)
                return (EINVAL);
 
-       error = copyin(uap->name, &name, uap->namelen * sizeof(int));
+       error = copyin(uap->name, &name, uap->namelen * sizeof(int));
        if (error)
                return (error);
 

diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 7ef2bc2..b0d8747 100644 (file)
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -39,7 +39,6 @@
  *
  *     @(#)tty.c       8.8 (Berkeley) 1/21/94
  * $FreeBSD: src/sys/kern/tty.c,v 1.129.2.5 2002/03/11 01:32:31 dd Exp $
- * $DragonFly: src/sys/kern/tty.c,v 1.46 2008/09/10 09:50:09 y0netan1 Exp $
  */
 
 /*
@@ -1968,7 +1967,7 @@ read:
                 */
                if (error)
                        break;
-               if (uio->uio_resid == 0)
+               if (uio->uio_resid == 0)
                        break;
                first = 0;
        }
@@ -2004,11 +2003,11 @@ slowcase:
                /*
                 * Give user character.
                 */
-               error = ureadc(c, uio);
+               error = ureadc(c, uio);
                if (error)
                        /* XXX should ungetc(c, qp). */
                        break;
-               if (uio->uio_resid == 0)
+               if (uio->uio_resid == 0)
                        break;
                /*
                 * In canonical mode check for a "break character"

diff --git a/sys/libprop/prop_object.c b/sys/libprop/prop_object.c
index b8ec0b4..e96f67f 100644 (file)
--- a/sys/libprop/prop_object.c
+++ b/sys/libprop/prop_object.c
@@ -1015,7 +1015,7 @@ prop_object_release_emergency(prop_object_t obj)
                _PROP_ASSERT(obj);
 
                if (po->po_type->pot_lock != NULL)
-               po->po_type->pot_lock();
+                       po->po_type->pot_lock();
 
                /* Save pointerto unlock function */
                unlock = po->po_type->pot_unlock;

diff --git a/sys/net/pf/pf.c b/sys/net/pf/pf.c
index fa3425a..70898e2 100644 (file)
--- a/sys/net/pf/pf.c
+++ b/sys/net/pf/pf.c
@@ -2334,8 +2334,8 @@ pf_map_addr(sa_family_t af, struct pf_rule *r, struct pf_addr *saddr,
                            (rpool->opts & PF_POOL_TYPEMASK) !=
                            PF_POOL_ROUNDROBIN)
                                return (1);
-                        raddr = &rpool->cur->addr.p.dyn->pfid_addr4;
-                        rmask = &rpool->cur->addr.p.dyn->pfid_mask4;
+                       raddr = &rpool->cur->addr.p.dyn->pfid_addr4;
+                       rmask = &rpool->cur->addr.p.dyn->pfid_mask4;
                        break;
 #endif /* INET */
 #ifdef INET6
@@ -5238,7 +5238,7 @@ pf_test_state_other(struct pf_state **state, int direction, struct pfi_kif *kif,
                                    nk->addr[pd->didx].v4.s_addr,
                                    0);
 
-                               break;
+                       break;
 #endif /* INET */
 #ifdef INET6
                case AF_INET6:

diff --git a/sys/net/sppp/if_spppsubr.c b/sys/net/sppp/if_spppsubr.c
index 0f185d1..e7b4f46 100644 (file)
--- a/sys/net/sppp/if_spppsubr.c
+++ b/sys/net/sppp/if_spppsubr.c
@@ -18,7 +18,6 @@
  * From: Version 2.4, Thu Apr 30 17:17:21 MSD 1997
  *
  * $FreeBSD: src/sys/net/if_spppsubr.c,v 1.59.2.13 2002/07/03 15:44:41 joerg Exp $
- * $DragonFly: src/sys/net/sppp/if_spppsubr.c,v 1.35 2008/06/09 11:24:24 sephe Exp $
  */
 
 #include <sys/param.h>
@@ -513,9 +512,9 @@ sppp_input(struct ifnet *ifp, struct mbuf *m)
                        log(LOG_DEBUG,
                            SPP_FMT "input packet is too small, %d bytes\n",
                            SPP_ARGS(ifp), m->m_pkthdr.len);
-         drop:
+drop:
                m_freem (m);
-         drop2:
+drop2:
                ++ifp->if_ierrors;
                ++ifp->if_iqdrops;
                return;

diff --git a/sys/net/tun/if_tun.c b/sys/net/tun/if_tun.c
index a88c12f..64f9560 100644 (file)
--- a/sys/net/tun/if_tun.c
+++ b/sys/net/tun/if_tun.c
@@ -427,20 +427,20 @@ tunioctl(struct dev_ioctl_args *ap)
        struct tuninfo *tunp;
 
        switch (ap->a_cmd) {
-       case TUNSIFINFO:
-               tunp = (struct tuninfo *)ap->a_data;
+       case TUNSIFINFO:
+               tunp = (struct tuninfo *)ap->a_data;
                if (tunp->mtu < IF_MINMTU)
                        return (EINVAL);
-               tp->tun_if.if_mtu = tunp->mtu;
-               tp->tun_if.if_type = tunp->type;
-               tp->tun_if.if_baudrate = tunp->baudrate;
-               break;
-       case TUNGIFINFO:
-               tunp = (struct tuninfo *)ap->a_data;
-               tunp->mtu = tp->tun_if.if_mtu;
-               tunp->type = tp->tun_if.if_type;
-               tunp->baudrate = tp->tun_if.if_baudrate;
-               break;
+               tp->tun_if.if_mtu = tunp->mtu;
+               tp->tun_if.if_type = tunp->type;
+               tp->tun_if.if_baudrate = tunp->baudrate;
+               break;
+       case TUNGIFINFO:
+               tunp = (struct tuninfo *)ap->a_data;
+               tunp->mtu = tp->tun_if.if_mtu;
+               tunp->type = tp->tun_if.if_type;
+               tunp->baudrate = tp->tun_if.if_baudrate;
+               break;
        case TUNSDEBUG:
                tundebug = *(int *)ap->a_data;
                break;

diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c
index a68fff1..f6a84bb 100644 (file)
--- a/sys/netinet/sctp_input.c
+++ b/sys/netinet/sctp_input.c
@@ -2752,7 +2752,7 @@ sctp_handle_stream_reset_response(struct sctp_tcb *stcb,
                            M_NOWAIT);
                        if (stcb->asoc.pending_reply == NULL)
                                return;         /* XXX */
-                       memcpy(stcb->asoc.pending_reply, resp, param_length);
+                       memcpy(stcb->asoc.pending_reply, resp, param_length);
                }
 
        } else {

diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c
index 8af7cca..699f52d 100644 (file)
--- a/sys/netinet/sctp_pcb.c
+++ b/sys/netinet/sctp_pcb.c
@@ -2180,7 +2180,7 @@ sctp_iterator_inp_being_freed(struct sctp_inpcb *inp, struct sctp_inpcb *inp_nex
                if (it == inp->inp_starting_point_for_iterator)
                        /* skip this guy, he's special */
                        continue;
-               if (it->inp == inp) {
+               if (it->inp == inp) {
                        /* This is tricky and we DON'T lock the iterator.
                         * Reason is he's running but waiting for me since
                         * inp->inp_starting_point_for_iterator has the lock

diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index d72dc60..b606aab 100644 (file)
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -2247,7 +2247,7 @@ in6_ifawithscope(struct ifnet *oifp, struct in6_addr *dst)
                        if (bscopecmp < 0)
                                goto replace; /* (9) */
 
-                 replace:
+replace:
                        ifa_best = (struct in6_ifaddr *)ifa;
                        blen = tlen >= 0 ? tlen :
                                in6_matchlen(IFA_IN6(ifa), dst);

diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c
index a5f6263..146859c 100644 (file)
--- a/sys/netinet6/in6_pcb.c
+++ b/sys/netinet6/in6_pcb.c
@@ -691,8 +691,8 @@ in6_pcbdetach(struct inpcb *inp)
 
        if (inp->in6p_options)
                m_freem(inp->in6p_options);
-       ip6_freepcbopts(inp->in6p_outputopts);
-       ip6_freemoptions(inp->in6p_moptions);
+       ip6_freepcbopts(inp->in6p_outputopts);
+       ip6_freemoptions(inp->in6p_moptions);
        if (inp->in6p_route.ro_rt)
                rtfree(inp->in6p_route.ro_rt);
        /* Check and free IPv4 related resources in case of mapped addr */
@@ -909,13 +909,13 @@ in6_pcbnotify(struct inpcbhead *head, struct sockaddr *dst, in_port_t fport,
        if (cmd != PRC_MSGSIZE)
                arg = inet6ctlerrmap[cmd];
        crit_enter();
-       for (inp = LIST_FIRST(head); inp != NULL; inp = ninp) {
-               ninp = LIST_NEXT(inp, inp_list);
+       for (inp = LIST_FIRST(head); inp != NULL; inp = ninp) {
+               ninp = LIST_NEXT(inp, inp_list);
 
                if (inp->inp_flags & INP_PLACEMARKER)
                        continue;
 
-               if ((inp->inp_vflag & INP_IPV6) == 0)
+               if ((inp->inp_vflag & INP_IPV6) == 0)
                        continue;
                /*
                 * If the error designates a new path MTU for a destination