diff options
| author | thompsa <thompsa@FreeBSD.org> | 2006-01-02 09:50:34 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2006-01-02 09:50:34 +0000 |
| commit | 488cd36dae716f90449d14d10d2802d2a001b374 (patch) | |
| tree | b2df04129abb098b0f190118f8b695bbb8e88cf1 /sys | |
| parent | 6e6de63b656a2e0baa692abfdaa3ed4e487b8cee (diff) | |
| download | FreeBSD-src-488cd36dae716f90449d14d10d2802d2a001b374.zip FreeBSD-src-488cd36dae716f90449d14d10d2802d2a001b374.tar.gz | |
Minor whitespace cleanup.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_bridge.c | 35 | ||||
| -rw-r--r-- | sys/net/if_bridgevar.h | 2 |
2 files changed, 18 insertions, 19 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 6ebeaa5..d8cafe9 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -720,24 +720,24 @@ bridge_delete_member(struct bridge_softc *sc, struct bridge_iflist *bif, BRIDGE_LOCK_ASSERT(sc); if (!gone) { - switch (ifs->if_type) { - case IFT_ETHER: - case IFT_L2VLAN: - /* - * Take the interface out of promiscuous mode. - */ - (void) ifpromisc(ifs, 0); - break; - - case IFT_GIF: - break; - - default: + switch (ifs->if_type) { + case IFT_ETHER: + case IFT_L2VLAN: + /* + * Take the interface out of promiscuous mode. + */ + (void) ifpromisc(ifs, 0); + break; + + case IFT_GIF: + break; + + default: #ifdef DIAGNOSTIC - panic("bridge_delete_member: impossible"); + panic("bridge_delete_member: impossible"); #endif - break; - } + break; + } } ifs->if_bridge = NULL; @@ -1358,7 +1358,6 @@ bridge_ifdetach(void *arg __unused, struct ifnet *ifp) if (bif != NULL) bridge_delete_member(sc, bif, 1); - BRIDGE_UNLOCK(sc); return; } @@ -1958,7 +1957,7 @@ bridge_input(struct ifnet *ifp, struct mbuf *m) * Unicast. Make sure it's not for us. */ LIST_FOREACH(bif, &sc->sc_iflist, bif_next) { - if(bif->bif_ifp->if_type == IFT_GIF) + if (bif->bif_ifp->if_type == IFT_GIF) continue; /* It is destined for us. */ if (memcmp(IF_LLADDR(bif->bif_ifp), eh->ether_dhost, diff --git a/sys/net/if_bridgevar.h b/sys/net/if_bridgevar.h index 7d07b01..d54cb56 100644 --- a/sys/net/if_bridgevar.h +++ b/sys/net/if_bridgevar.h @@ -105,7 +105,7 @@ #define BRDGGMA 19 /* get max age (ifbrparam) */ #define BRDGSMA 20 /* set max age (ifbrparam) */ #define BRDGSIFPRIO 21 /* set if priority (ifbreq) */ -#define BRDGSIFCOST 22 /* set if path cost (ifbreq) */ +#define BRDGSIFCOST 22 /* set if path cost (ifbreq) */ #define BRDGADDS 23 /* add bridge span member (ifbreq) */ #define BRDGDELS 24 /* delete bridge span member (ifbreq) */ |
