Sun Mar 15 21:23:32 2009 UTC ()
ansify function definitions


(cegger)
diff -r1.3 -r1.4 src/sys/net/agr/if_agrsoftc.c

cvs diff -r1.3 -r1.4 src/sys/net/agr/if_agrsoftc.c (expand / switch to unified diff)

--- src/sys/net/agr/if_agrsoftc.c 2005/11/23 09:43:37 1.3
+++ src/sys/net/agr/if_agrsoftc.c 2009/03/15 21:23:31 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: if_agrsoftc.c,v 1.3 2005/11/23 09:43:37 yamt Exp $ */ 1/* $NetBSD: if_agrsoftc.c,v 1.4 2009/03/15 21:23:31 cegger Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c)2005 YAMAMOTO Takashi, 4 * Copyright (c)2005 YAMAMOTO Takashi,
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -17,43 +17,43 @@ @@ -17,43 +17,43 @@
17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 17 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE 19 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 20 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE. 26 * SUCH DAMAGE.
27 */ 27 */
28 28
29#include <sys/cdefs.h> 29#include <sys/cdefs.h>
30__KERNEL_RCSID(0, "$NetBSD: if_agrsoftc.c,v 1.3 2005/11/23 09:43:37 yamt Exp $"); 30__KERNEL_RCSID(0, "$NetBSD: if_agrsoftc.c,v 1.4 2009/03/15 21:23:31 cegger Exp $");
31 31
32#include <sys/param.h> 32#include <sys/param.h>
33#include <sys/callout.h> 33#include <sys/callout.h>
34#include <sys/malloc.h> 34#include <sys/malloc.h>
35 35
36#include <net/if.h> 36#include <net/if.h>
37#include <net/if_ether.h> 37#include <net/if_ether.h>
38 38
39#include <net/agr/if_agrvar_impl.h> 39#include <net/agr/if_agrvar_impl.h>
40 40
41/* 41/*
42 * these functions are isolated from if_agr.c to avoid inclusion of if_ether.h. 42 * these functions are isolated from if_agr.c to avoid inclusion of if_ether.h.
43 */ 43 */
44 44
45struct agr_softc * 45struct agr_softc *
46agr_alloc_softc() 46agr_alloc_softc(void)
47{ 47{
48 struct agr_softc *sc; 48 struct agr_softc *sc;
49 union { 49 union {
50 struct ifnet u_if; 50 struct ifnet u_if;
51 struct ethercom u_ec; 51 struct ethercom u_ec;
52 } *u; 52 } *u;
53 53
54 /* 54 /*
55 * as we don't know our if_type yet.. 55 * as we don't know our if_type yet..
56 */ 56 */
57 57
58 sc = malloc(sizeof(*sc) - sizeof(sc->sc_if) + sizeof(*u), 58 sc = malloc(sizeof(*sc) - sizeof(sc->sc_if) + sizeof(*u),
59 M_DEVBUF, M_WAITOK | M_ZERO); 59 M_DEVBUF, M_WAITOK | M_ZERO);