Mon Jan 21 16:52:56 2013 UTC ()
remove trailing lines


(christos)
diff -r1.20 -r1.21 src/sys/dev/usb/if_otus.c
diff -r1.14 -r1.15 src/sys/dev/usb/if_urtwn.c
cvs diff -r1.20 -r1.21 src/sys/dev/usb/if_otus.c (expand / switch to unified diff)

--- src/sys/dev/usb/if_otus.c 2013/01/20 21:50:41 1.20
+++ src/sys/dev/usb/if_otus.c 2013/01/21 16:52:56 1.21
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1/* $NetBSD: if_otus.c,v 1.20 2013/01/20 21:50:41 christos Exp $ */ 1/* $NetBSD: if_otus.c,v 1.21 2013/01/21 16:52:56 christos Exp $ */
2/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */ 2/* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */
3 3
4/*- 4/*-
5 * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr> 5 * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20/*- 20/*-
21 * Driver for Atheros AR9001U chipset. 21 * Driver for Atheros AR9001U chipset.
22 * http://www.atheros.com/pt/bulletins/AR9001USBBulletin.pdf 22 * http://www.atheros.com/pt/bulletins/AR9001USBBulletin.pdf
23 */ 23 */
24 24
25#include <sys/cdefs.h> 25#include <sys/cdefs.h>
26__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.20 2013/01/20 21:50:41 christos Exp $"); 26__KERNEL_RCSID(0, "$NetBSD: if_otus.c,v 1.21 2013/01/21 16:52:56 christos Exp $");
27 27
28#include <sys/param.h> 28#include <sys/param.h>
29#include <sys/sockio.h> 29#include <sys/sockio.h>
30#include <sys/mbuf.h> 30#include <sys/mbuf.h>
31#include <sys/kernel.h> 31#include <sys/kernel.h>
32#include <sys/kthread.h> 32#include <sys/kthread.h>
33#include <sys/systm.h> 33#include <sys/systm.h>
34#include <sys/callout.h> 34#include <sys/callout.h>
35#include <sys/device.h> 35#include <sys/device.h>
36#include <sys/proc.h> 36#include <sys/proc.h>
37#include <sys/bus.h> 37#include <sys/bus.h>
38#include <sys/endian.h> 38#include <sys/endian.h>
39#include <sys/intr.h> 39#include <sys/intr.h>
@@ -3359,14 +3359,13 @@ otus_output(struct ifnet *ifp, struct mb @@ -3359,14 +3359,13 @@ otus_output(struct ifnet *ifp, struct mb
3359 DPRINTFN(DBG_FN, sc, "\n"); 3359 DPRINTFN(DBG_FN, sc, "\n");
3360 3360
3361 ic = &sc->sc_ic; 3361 ic = &sc->sc_ic;
3362 3362
3363 /* 3363 /*
3364 * Hand to the 802.3 code if not tagged as a raw 802.11 frame. 3364 * Hand to the 802.3 code if not tagged as a raw 802.11 frame.
3365 */ 3365 */
3366 if (dst->sa_family != AF_IEEE80211) 3366 if (dst->sa_family != AF_IEEE80211)
3367 return sc->sc_if_output(ifp, m, dst, rt); 3367 return sc->sc_if_output(ifp, m, dst, rt);
3368 3368
3369 return ieee80211_output(ifp, m, dst, ic); 3369 return ieee80211_output(ifp, m, dst, ic);
3370} 3370}
3371#endif /* IEEE80211_INJECTION */ 3371#endif /* IEEE80211_INJECTION */
3372 
cvs diff -r1.14 -r1.15 src/sys/dev/usb/if_urtwn.c (expand / switch to unified diff)

--- src/sys/dev/usb/if_urtwn.c 2013/01/21 00:02:11 1.14
+++ src/sys/dev/usb/if_urtwn.c 2013/01/21 16:52:56 1.15
@@ -1,38 +1,38 @@ @@ -1,38 +1,38 @@
1/* $NetBSD: if_urtwn.c,v 1.14 2013/01/21 00:02:11 jmcneill Exp $ */ 1/* $NetBSD: if_urtwn.c,v 1.15 2013/01/21 16:52:56 christos Exp $ */
2/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */ 2/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
3 3
4/*- 4/*-
5 * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr> 5 * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
6 * 6 *
7 * Permission to use, copy, modify, and distribute this software for any 7 * Permission to use, copy, modify, and distribute this software for any
8 * purpose with or without fee is hereby granted, provided that the above 8 * purpose with or without fee is hereby granted, provided that the above
9 * copyright notice and this permission notice appear in all copies. 9 * copyright notice and this permission notice appear in all copies.
10 * 10 *
11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES 11 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 12 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR 13 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 14 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
18 */ 18 */
19 19
20/*- 20/*-
21 * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188RU/RTL8192CU. 21 * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188RU/RTL8192CU.
22 */ 22 */
23 23
24#include <sys/cdefs.h> 24#include <sys/cdefs.h>
25__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.14 2013/01/21 00:02:11 jmcneill Exp $"); 25__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.15 2013/01/21 16:52:56 christos Exp $");
26 26
27#ifdef _KERNEL_OPT 27#ifdef _KERNEL_OPT
28#include "opt_inet.h" 28#include "opt_inet.h"
29#endif 29#endif
30 30
31#include <sys/param.h> 31#include <sys/param.h>
32#include <sys/sockio.h> 32#include <sys/sockio.h>
33#include <sys/sysctl.h> 33#include <sys/sysctl.h>
34#include <sys/mbuf.h> 34#include <sys/mbuf.h>
35#include <sys/kernel.h> 35#include <sys/kernel.h>
36#include <sys/socket.h> 36#include <sys/socket.h>
37#include <sys/systm.h> 37#include <sys/systm.h>
38#include <sys/malloc.h> 38#include <sys/malloc.h>
@@ -3991,14 +3991,13 @@ if_urtwn_modcmd(modcmd_t cmd, void *aux) @@ -3991,14 +3991,13 @@ if_urtwn_modcmd(modcmd_t cmd, void *aux)
3991 cfattach_ioconf_urtwn, cfdata_ioconf_urtwn); 3991 cfattach_ioconf_urtwn, cfdata_ioconf_urtwn);
3992#endif 3992#endif
3993 return (error); 3993 return (error);
3994 case MODULE_CMD_FINI: 3994 case MODULE_CMD_FINI:
3995#ifdef _MODULE 3995#ifdef _MODULE
3996 error = config_fini_component(cfdriver_ioconf_urtwn, 3996 error = config_fini_component(cfdriver_ioconf_urtwn,
3997 cfattach_ioconf_urtwn, cfdata_ioconf_urtwn); 3997 cfattach_ioconf_urtwn, cfdata_ioconf_urtwn);
3998#endif 3998#endif
3999 return (error); 3999 return (error);
4000 default: 4000 default:
4001 return (ENOTTY); 4001 return (ENOTTY);
4002 } 4002 }
4003} 4003}
4004