Module Name: src
Committed By: christos
Date: Sat Mar 30 14:30:24 UTC 2013
Modified Files:
src/sys/dev/usb: if_athn_usb.c if_smsc.c
Log Message:
correct location of the firmware file again.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/if_athn_usb.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/usb/if_smsc.c
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_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.3 src/sys/dev/usb/if_athn_usb.c:1.4
--- src/sys/dev/usb/if_athn_usb.c:1.3 Sat Mar 30 10:14:31 2013
+++ src/sys/dev/usb/if_athn_usb.c Sat Mar 30 10:30:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.3 2013/03/30 14:14:31 christos Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.4 2013/03/30 14:30:24 christos Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.3 2013/03/30 14:14:31 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.4 2013/03/30 14:30:24 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -813,7 +813,7 @@ athn_usb_load_firmware(struct athn_usb_s
name = "athn-ar9271";
/* Read firmware image from the filesystem. */
- if ((error = firmware_open("if_athn_usb", name, &fwh)) != 0) {
+ if ((error = firmware_open("if_athn", name, &fwh)) != 0) {
aprint_error_dev(sc->sc_dev,
"failed to open firmware file %s (%d)\n", name, error);
return error;
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.9 src/sys/dev/usb/if_smsc.c:1.10
--- src/sys/dev/usb/if_smsc.c:1.9 Fri Mar 29 23:15:52 2013
+++ src/sys/dev/usb/if_smsc.c Sat Mar 30 10:30:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.9 2013/03/30 03:15:52 christos Exp $ */
+/* $NetBSD: if_smsc.c,v 1.10 2013/03/30 14:30:24 christos Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1308,7 +1308,7 @@ smsc_rxeof(usbd_xfer_handle xfer, usbd_p
m->m_pkthdr.rcvif = ifp;
pktlen -= 2; // JDM
-
+
m->m_pkthdr.len = m->m_len = pktlen;
#define ETHER_ALIGN 2
m_adj(m, ETHER_ALIGN);
