Date: Thu, 17 Feb 2011 07:39:54 +0000 (UTC) From: Hans Petter Selasky <hselasky@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r218765 - in head: share/man/man4 sys/conf sys/dev/usb/net Message-ID: <201102170739.p1H7dsFp099563@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: hselasky Date: Thu Feb 17 07:39:53 2011 New Revision: 218765 URL: http://svn.freebsd.org/changeset/base/218765 Log: - Fix build of manual page and inclusion of mos driver into kernel config file. - Fix style compliancy by wrapping some long lines in if_mos.c Approved by: thompsa (mentor) Modified: head/share/man/man4/Makefile head/share/man/man4/mos.4 head/sys/conf/files head/sys/dev/usb/net/if_mos.c Modified: head/share/man/man4/Makefile ============================================================================== --- head/share/man/man4/Makefile Thu Feb 17 05:56:03 2011 (r218764) +++ head/share/man/man4/Makefile Thu Feb 17 07:39:53 2011 (r218765) @@ -221,6 +221,7 @@ MAN= aac.4 \ mmc.4 \ mmcsd.4 \ mn.4 \ + mos.4 \ mouse.4 \ mps.4 \ mpt.4 \ Modified: head/share/man/man4/mos.4 ============================================================================== --- head/share/man/man4/mos.4 Thu Feb 17 05:56:03 2011 (r218764) +++ head/share/man/man4/mos.4 Thu Feb 17 07:39:53 2011 (r218765) @@ -28,6 +28,7 @@ kernel configuration file: .Bd -ragged -offset indent .Cd "device uhci" .Cd "device ohci" +.Cd "device ehci" .Cd "device usb" .Cd "device miibus" .Cd "device mos" @@ -72,6 +73,7 @@ driver include: .Bl -bullet -compact .It Sitecom LN030 +.El .Sh SEE ALSO .Xr altq 4 , .Xr arp 4 , Modified: head/sys/conf/files ============================================================================== --- head/sys/conf/files Thu Feb 17 05:56:03 2011 (r218764) +++ head/sys/conf/files Thu Feb 17 07:39:53 2011 (r218765) @@ -1815,10 +1815,11 @@ dev/usb/net/if_cdce.c optional cdce dev/usb/net/if_cue.c optional cue dev/usb/net/if_ipheth.c optional ipheth dev/usb/net/if_kue.c optional kue +dev/usb/net/if_mos.c optional mos dev/usb/net/if_rue.c optional rue dev/usb/net/if_udav.c optional udav -dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | rue | \ - udav +dev/usb/net/usb_ethernet.c optional aue | axe | cdce | cue | kue | mos | \ + rue | udav dev/usb/net/uhso.c optional uhso # # USB WLAN drivers Modified: head/sys/dev/usb/net/if_mos.c ============================================================================== --- head/sys/dev/usb/net/if_mos.c Thu Feb 17 05:56:03 2011 (r218764) +++ head/sys/dev/usb/net/if_mos.c Thu Feb 17 07:39:53 2011 (r218765) @@ -802,8 +802,10 @@ mos_bulk_read_callback(struct usb_xfer * MOS_DPRINTFN("erroneous frame received"); if (rxstat & MOS_RXSTS_SHORT_FRAME) MOS_DPRINTFN("frame size less than 64 bytes"); - if (rxstat & MOS_RXSTS_LARGE_FRAME) - MOS_DPRINTFN("frame size larger than 1532 bytes"); + if (rxstat & MOS_RXSTS_LARGE_FRAME) { + MOS_DPRINTFN("frame size larger than " + "1532 bytes"); + } if (rxstat & MOS_RXSTS_CRC_ERROR) MOS_DPRINTFN("CRC error"); if (rxstat & MOS_RXSTS_ALIGN_ERROR) @@ -814,7 +816,9 @@ mos_bulk_read_callback(struct usb_xfer * /* Remember the last byte was used for the status fields */ pktlen = actlen - 1; if (pktlen < sizeof(struct ether_header)) { - MOS_DPRINTFN("error: pktlen %d is smaller than ether_header %zd", pktlen, sizeof(struct ether_header)); + MOS_DPRINTFN("error: pktlen %d is smaller " + "than ether_header %zd", pktlen, + sizeof(struct ether_header)); ifp->if_ierrors++; goto tr_setup; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102170739.p1H7dsFp099563>