Module Name: src
Committed By: maya
Date: Mon Apr 30 01:14:07 UTC 2018
Modified Files:
src/sys/dev/usb: if_zyd.c if_zydreg.h
Log Message:
Remove set but not used sc_flags.
Built tested only.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/dev/usb/if_zyd.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/if_zydreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_zyd.c
diff -u src/sys/dev/usb/if_zyd.c:1.45 src/sys/dev/usb/if_zyd.c:1.46
--- src/sys/dev/usb/if_zyd.c:1.45 Sun Jan 21 13:57:12 2018
+++ src/sys/dev/usb/if_zyd.c Mon Apr 30 01:14:07 2018
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
-/* $NetBSD: if_zyd.c,v 1.45 2018/01/21 13:57:12 skrll Exp $ */
+/* $NetBSD: if_zyd.c,v 1.46 2018/04/30 01:14:07 maya Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.45 2018/01/21 13:57:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_zyd.c,v 1.46 2018/04/30 01:14:07 maya Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -296,7 +296,6 @@ zyd_attachhook(device_t self)
}
firmware_free(fw, size);
- sc->sc_flags |= ZD1211_FWLOADED;
/* complete the attach process */
if ((error = zyd_complete_attach(sc)) == 0)
@@ -315,7 +314,6 @@ zyd_attach(device_t parent, device_t sel
sc->sc_dev = self;
sc->sc_udev = uaa->uaa_device;
- sc->sc_flags = 0;
aprint_naive("\n");
aprint_normal("\n");
Index: src/sys/dev/usb/if_zydreg.h
diff -u src/sys/dev/usb/if_zydreg.h:1.8 src/sys/dev/usb/if_zydreg.h:1.9
--- src/sys/dev/usb/if_zydreg.h:1.8 Sat Apr 23 10:15:32 2016
+++ src/sys/dev/usb/if_zydreg.h Mon Apr 30 01:14:07 2018
@@ -1,5 +1,5 @@
/* $OpenBSD: if_zydreg.h,v 1.19 2006/11/30 19:28:07 damien Exp $ */
-/* $NetBSD: if_zydreg.h,v 1.8 2016/04/23 10:15:32 skrll Exp $ */
+/* $NetBSD: if_zydreg.h,v 1.9 2018/04/30 01:14:07 maya Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergam...@free.fr>
@@ -1185,9 +1185,6 @@ struct zyd_softc {
struct usb_task sc_task;
struct usbd_device * sc_udev;
struct usbd_interface * sc_iface;
- int sc_flags;
-#define ZD1211_FWLOADED (1 << 0)
-
enum ieee80211_state sc_state;
int sc_arg;
