From owner-svn-src-all@freebsd.org Tue Sep 1 21:24:46 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4DE30379B0A; Tue, 1 Sep 2020 21:24:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Bh0TB1g6mz4K8T; Tue, 1 Sep 2020 21:24:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1CBE01FCBF; Tue, 1 Sep 2020 21:24:46 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 081LOj6R024607; Tue, 1 Sep 2020 21:24:45 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 081LOYpR024546; Tue, 1 Sep 2020 21:24:34 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202009012124.081LOYpR024546@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Tue, 1 Sep 2020 21:24:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r365080 - in head/sys/compat: cloudabi32 cloudabi64 freebsd32 ia32 lindebugfs linprocfs linux linuxkpi/common/include/asm linuxkpi/common/include/linux linuxkpi/common/include/net linux... X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys/compat: cloudabi32 cloudabi64 freebsd32 ia32 lindebugfs linprocfs linux linuxkpi/common/include/asm linuxkpi/common/include/linux linuxkpi/common/include/net linuxkpi/common/src ndis X-SVN-Commit-Revision: 365080 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 21:24:46 -0000 Author: mjg Date: Tue Sep 1 21:24:33 2020 New Revision: 365080 URL: https://svnweb.freebsd.org/changeset/base/365080 Log: compat: clean up empty lines in .c and .h files Modified: head/sys/compat/cloudabi32/cloudabi32_proto.h head/sys/compat/cloudabi64/cloudabi64_proto.h head/sys/compat/freebsd32/freebsd32_ipc.h head/sys/compat/freebsd32/freebsd32_misc.c head/sys/compat/freebsd32/freebsd32_proto.h head/sys/compat/ia32/ia32_signal.h head/sys/compat/lindebugfs/lindebugfs.c head/sys/compat/linprocfs/linprocfs.c head/sys/compat/linux/linux_common.c head/sys/compat/linux/linux_event.c head/sys/compat/linux/linux_file.c head/sys/compat/linux/linux_fork.c head/sys/compat/linux/linux_futex.c head/sys/compat/linux/linux_ioctl.c head/sys/compat/linux/linux_ipc.c head/sys/compat/linux/linux_misc.c head/sys/compat/linux/linux_misc.h head/sys/compat/linux/linux_mmap.c head/sys/compat/linux/linux_signal.c head/sys/compat/linux/linux_socket.c head/sys/compat/linux/linux_stats.c head/sys/compat/linux/linux_time.c head/sys/compat/linux/linux_timer.c head/sys/compat/linux/linux_vdso.c head/sys/compat/linuxkpi/common/include/asm/atomic-long.h head/sys/compat/linuxkpi/common/include/asm/atomic.h head/sys/compat/linuxkpi/common/include/asm/atomic64.h head/sys/compat/linuxkpi/common/include/linux/compat.h head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h head/sys/compat/linuxkpi/common/include/linux/dmapool.h head/sys/compat/linuxkpi/common/include/linux/fs.h head/sys/compat/linuxkpi/common/include/linux/io.h head/sys/compat/linuxkpi/common/include/linux/jhash.h head/sys/compat/linuxkpi/common/include/linux/kmod.h head/sys/compat/linuxkpi/common/include/linux/kref.h head/sys/compat/linuxkpi/common/include/linux/list.h head/sys/compat/linuxkpi/common/include/linux/pci.h head/sys/compat/linuxkpi/common/include/linux/scatterlist.h head/sys/compat/linuxkpi/common/include/linux/sysfs.h head/sys/compat/linuxkpi/common/include/net/ipv6.h head/sys/compat/linuxkpi/common/src/linux_compat.c head/sys/compat/linuxkpi/common/src/linux_hrtimer.c head/sys/compat/linuxkpi/common/src/linux_idr.c head/sys/compat/linuxkpi/common/src/linux_kmod.c head/sys/compat/linuxkpi/common/src/linux_pci.c head/sys/compat/linuxkpi/common/src/linux_radix.c head/sys/compat/linuxkpi/common/src/linux_rcu.c head/sys/compat/linuxkpi/common/src/linux_seq_file.c head/sys/compat/linuxkpi/common/src/linux_usb.c head/sys/compat/ndis/kern_ndis.c head/sys/compat/ndis/kern_windrv.c head/sys/compat/ndis/ndis_var.h head/sys/compat/ndis/ntoskrnl_var.h head/sys/compat/ndis/pe_var.h head/sys/compat/ndis/subr_hal.c head/sys/compat/ndis/subr_ndis.c head/sys/compat/ndis/subr_ntoskrnl.c head/sys/compat/ndis/subr_usbd.c Modified: head/sys/compat/cloudabi32/cloudabi32_proto.h ============================================================================== --- head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/cloudabi32/cloudabi32_proto.h Tue Sep 1 21:24:33 2020 (r365080) @@ -324,42 +324,29 @@ int cloudabi_sys_thread_yield(struct thread *, struct #ifdef COMPAT_43 - #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 - #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 - #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 - #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 - #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 - #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 - #endif /* COMPAT_FREEBSD12 */ Modified: head/sys/compat/cloudabi64/cloudabi64_proto.h ============================================================================== --- head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/cloudabi64/cloudabi64_proto.h Tue Sep 1 21:24:33 2020 (r365080) @@ -324,42 +324,29 @@ int cloudabi_sys_thread_yield(struct thread *, struct #ifdef COMPAT_43 - #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 - #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 - #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 - #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 - #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 - #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 - #endif /* COMPAT_FREEBSD12 */ Modified: head/sys/compat/freebsd32/freebsd32_ipc.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_ipc.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/freebsd32/freebsd32_ipc.h Tue Sep 1 21:24:33 2020 (r365080) @@ -60,7 +60,6 @@ struct semid_kernel32 { }; #endif /* _KERNEL */ - union semun32 { int val; uint32_t buf; Modified: head/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- head/sys/compat/freebsd32/freebsd32_misc.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/freebsd32/freebsd32_misc.c Tue Sep 1 21:24:33 2020 (r365080) @@ -323,7 +323,6 @@ freebsd4_freebsd32_getfsstat(struct thread *td, int freebsd10_freebsd32_pipe(struct thread *td, struct freebsd10_freebsd32_pipe_args *uap) { - return (freebsd10_pipe(td, (struct freebsd10_pipe_args*)uap)); } #endif @@ -465,7 +464,6 @@ freebsd32_fexecve(struct thread *td, struct freebsd32_ post_execve(td, error, oldvmspace); return (error); } - int freebsd32_mknodat(struct thread *td, struct freebsd32_mknodat_args *uap) Modified: head/sys/compat/freebsd32/freebsd32_proto.h ============================================================================== --- head/sys/compat/freebsd32/freebsd32_proto.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/freebsd32/freebsd32_proto.h Tue Sep 1 21:24:33 2020 (r365080) @@ -976,7 +976,6 @@ int ofreebsd32_getdirentries(struct thread *, struct o #endif /* COMPAT_43 */ - #ifdef COMPAT_FREEBSD4 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1042,7 +1041,6 @@ int freebsd4_freebsd32_sigreturn(struct thread *, stru #endif /* COMPAT_FREEBSD4 */ - #ifdef COMPAT_FREEBSD6 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1132,7 +1130,6 @@ int freebsd6_freebsd32_lio_listio(struct thread *, str #endif /* COMPAT_FREEBSD6 */ - #ifdef COMPAT_FREEBSD7 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1175,7 +1172,6 @@ int freebsd7_freebsd32_shmctl(struct thread *, struct #endif /* COMPAT_FREEBSD7 */ - #ifdef COMPAT_FREEBSD10 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1200,7 +1196,6 @@ int freebsd10_freebsd32_pipe(struct thread *, struct f #endif /* COMPAT_FREEBSD10 */ - #ifdef COMPAT_FREEBSD11 #if !defined(PAD64_REQUIRED) && !defined(__amd64__) @@ -1272,7 +1267,6 @@ int freebsd11_freebsd32_kevent(struct thread *, struct int freebsd11_freebsd32_fstatat(struct thread *, struct freebsd11_freebsd32_fstatat_args *); #endif /* COMPAT_FREEBSD11 */ - #ifdef COMPAT_FREEBSD12 Modified: head/sys/compat/ia32/ia32_signal.h ============================================================================== --- head/sys/compat/ia32/ia32_signal.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ia32/ia32_signal.h Tue Sep 1 21:24:33 2020 (r365080) @@ -88,7 +88,6 @@ struct ia32_ucontext { u_int32_t __spare__[4]; }; - #if defined(COMPAT_FREEBSD4) struct ia32_mcontext4 { u_int32_t mc_onstack; /* XXX - sigcontext compat. */ Modified: head/sys/compat/lindebugfs/lindebugfs.c ============================================================================== --- head/sys/compat/lindebugfs/lindebugfs.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/lindebugfs/lindebugfs.c Tue Sep 1 21:24:33 2020 (r365080) @@ -294,7 +294,6 @@ debugfs_remove_recursive(struct dentry *dnode) pfs_destroy(dnode->d_pfs_node); } - static int debugfs_init(PFS_INIT_ARGS) { Modified: head/sys/compat/linprocfs/linprocfs.c ============================================================================== --- head/sys/compat/linprocfs/linprocfs.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linprocfs/linprocfs.c Tue Sep 1 21:24:33 2020 (r365080) @@ -1041,7 +1041,6 @@ linprocfs_doprocstatus(PFS_FILL_ARGS) return (0); } - /* * Filler function for proc/pid/cwd */ Modified: head/sys/compat/linux/linux_common.c ============================================================================== --- head/sys/compat/linux/linux_common.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_common.c Tue Sep 1 21:24:33 2020 (r365080) @@ -60,7 +60,6 @@ static eventhandler_tag linux_exec_tag; static eventhandler_tag linux_thread_dtor_tag; static eventhandler_tag linux_exit_tag; - static int linux_common_modevent(module_t mod, int type, void *data) { Modified: head/sys/compat/linux/linux_event.c ============================================================================== --- head/sys/compat/linux/linux_event.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_event.c Tue Sep 1 21:24:33 2020 (r365080) @@ -221,7 +221,6 @@ static int eventfd_create(struct thread *td, uint32_t static void linux_timerfd_expire(void *); static void linux_timerfd_curval(struct timerfd *, struct itimerspec *); - static void epoll_fd_install(struct thread *td, int fd, epoll_udata_t udata) { @@ -574,7 +573,6 @@ linux_epoll_wait_common(struct thread *td, int epfd, s td->td_flags |= TDF_ASTPENDING; thread_unlock(td); } - coargs.leventlist = events; coargs.p = td->td_proc; Modified: head/sys/compat/linux/linux_file.c ============================================================================== --- head/sys/compat/linux/linux_file.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_file.c Tue Sep 1 21:24:33 2020 (r365080) @@ -539,7 +539,6 @@ out: } #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ - /* * These exist mainly for hooks for doing /compat/linux translation. */ Modified: head/sys/compat/linux/linux_fork.c ============================================================================== --- head/sys/compat/linux/linux_fork.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_fork.c Tue Sep 1 21:24:33 2020 (r365080) @@ -423,7 +423,6 @@ linux_thread_detach(struct thread *td) child_clear_tid = em->child_clear_tid; if (child_clear_tid != NULL) { - LINUX_CTR2(thread_detach, "thread(%d) %p", em->em_tid, child_clear_tid); Modified: head/sys/compat/linux/linux_futex.c ============================================================================== --- head/sys/compat/linux/linux_futex.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_futex.c Tue Sep 1 21:24:33 2020 (r365080) @@ -999,7 +999,6 @@ retry2: else op_ret += futex_wake(f, nrwake, args->val3); ret += op_ret; - } if (f2 != NULL) futex_put(f2, NULL); Modified: head/sys/compat/linux/linux_ioctl.c ============================================================================== --- head/sys/compat/linux/linux_ioctl.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_ioctl.c Tue Sep 1 21:24:33 2020 (r365080) @@ -713,7 +713,6 @@ linux_ioctl_termio(struct thread *td, struct linux_ioc return (error); switch (args->cmd & 0xffff) { - case LINUX_TCGETS: error = fo_ioctl(fp, TIOCGETA, (caddr_t)&bios, td->td_ucred, td); @@ -1455,7 +1454,6 @@ linux_ioctl_cdrom(struct thread *td, struct linux_ioct if (error != 0) return (error); switch (args->cmd & 0xffff) { - case LINUX_CDROMPAUSE: args->cmd = CDIOCPAUSE; error = (sys_ioctl(td, (struct ioctl_args *)args)); @@ -1723,7 +1721,6 @@ linux_ioctl_sound(struct thread *td, struct linux_ioct { switch (args->cmd & 0xffff) { - case LINUX_SOUND_MIXER_WRITE_VOLUME: args->cmd = SETDIR(SOUND_MIXER_WRITE_VOLUME); return (sys_ioctl(td, (struct ioctl_args *)args)); @@ -1981,7 +1978,6 @@ linux_ioctl_sound(struct thread *td, struct linux_ioct case LINUX_SNDCTL_SYNTH_MEMAVL: args->cmd = SNDCTL_SYNTH_MEMAVL; return (sys_ioctl(td, (struct ioctl_args *)args)); - } return (ENOIOCTL); @@ -2001,7 +1997,6 @@ linux_ioctl_console(struct thread *td, struct linux_io if (error != 0) return (error); switch (args->cmd & 0xffff) { - case LINUX_KIOCSOUND: args->cmd = KIOCSOUND; error = (sys_ioctl(td, (struct ioctl_args *)args)); @@ -2295,7 +2290,6 @@ linux_gifhwaddr(struct ifnet *ifp, struct l_ifreq *ifr return (copyout(&lsa, &ifr->ifr_hwaddr, sizeof(lsa))); } - /* * If we fault in bsd_to_linux_ifreq() then we will fault when we call * the native ioctl(). Thus, we don't really need to check the return @@ -2351,7 +2345,6 @@ linux_ioctl_socket(struct thread *td, struct linux_ioc } switch (args->cmd & 0xffff) { - case LINUX_FIOGETOWN: case LINUX_FIOSETOWN: case LINUX_SIOCADDMULTI: @@ -2404,7 +2397,6 @@ linux_ioctl_socket(struct thread *td, struct linux_ioc } switch (args->cmd & 0xffff) { - case LINUX_FIOSETOWN: args->cmd = FIOSETOWN; error = sys_ioctl(td, (struct ioctl_args *)args); Modified: head/sys/compat/linux/linux_ipc.c ============================================================================== --- head/sys/compat/linux/linux_ipc.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_ipc.c Tue Sep 1 21:24:33 2020 (r365080) @@ -832,7 +832,6 @@ linux_shmctl(struct thread *td, struct linux_shmctl_ar memset(&linux_shminfo64, 0, sizeof(linux_shminfo64)); switch (args->cmd & ~LINUX_IPC_64) { - case LINUX_IPC_INFO: { struct shminfo bsd_shminfo; Modified: head/sys/compat/linux/linux_misc.c ============================================================================== --- head/sys/compat/linux/linux_misc.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_misc.c Tue Sep 1 21:24:33 2020 (r365080) @@ -145,7 +145,6 @@ struct l_pselect6arg { static int linux_utimensat_nsec_valid(l_long); - int linux_sysinfo(struct thread *td, struct linux_sysinfo_args *args) { @@ -641,7 +640,6 @@ struct l_times_argv { l_clock_t tms_cstime; }; - /* * Glibc versions prior to 2.2.1 always use hard-coded CLK_TCK value. * Since 2.2.1 Glibc uses value exported from kernel via AT_CLKTCK @@ -1666,7 +1664,6 @@ linux_reboot(struct thread *td, struct linux_reboot_ar return (sys_reboot(td, &bsd_args)); } - int linux_getpid(struct thread *td, struct linux_getpid_args *args) { @@ -1688,7 +1685,6 @@ linux_gettid(struct thread *td, struct linux_gettid_ar return (0); } - int linux_getppid(struct thread *td, struct linux_getppid_args *args) Modified: head/sys/compat/linux/linux_misc.h ============================================================================== --- head/sys/compat/linux/linux_misc.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_misc.h Tue Sep 1 21:24:33 2020 (r365080) @@ -128,7 +128,6 @@ extern int stclohz; #define LINUX_WCONTINUED 0x00000008 #define LINUX_WNOWAIT 0x01000000 - #define __WNOTHREAD 0x20000000 #define __WALL 0x40000000 #define __WCLONE 0x80000000 Modified: head/sys/compat/linux/linux_mmap.c ============================================================================== --- head/sys/compat/linux/linux_mmap.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_mmap.c Tue Sep 1 21:24:33 2020 (r365080) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - #define STACK_SIZE (2 * 1024 * 1024) #define GUARD_SIZE (4 * PAGE_SIZE) Modified: head/sys/compat/linux/linux_signal.c ============================================================================== --- head/sys/compat/linux/linux_signal.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_signal.c Tue Sep 1 21:24:33 2020 (r365080) @@ -59,7 +59,6 @@ static int linux_do_tkill(struct thread *td, struct th ksiginfo_t *ksi); static void sicode_to_lsicode(int si_code, int *lsi_code); - static void linux_to_bsd_sigaction(l_sigaction_t *lsa, struct sigaction *bsa) { Modified: head/sys/compat/linux/linux_socket.c ============================================================================== --- head/sys/compat/linux/linux_socket.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_socket.c Tue Sep 1 21:24:33 2020 (r365080) @@ -88,7 +88,6 @@ static int linux_recvmsg_common(struct thread *, l_int l_uint, struct msghdr *); static int linux_set_socket_flags(int, int *); - static int linux_to_bsd_sockopt_level(int level) { @@ -778,7 +777,6 @@ linux_socketpair(struct thread *td, struct linux_socke if (error != 0) return (error); if (args->protocol != 0 && args->protocol != PF_UNIX) { - /* * Use of PF_UNIX as protocol argument is not right, * but Linux does it. @@ -1020,7 +1018,6 @@ linux_sendmsg_common(struct thread *td, l_int s, struc } if (linux_msghdr.msg_controllen >= sizeof(struct l_cmsghdr)) { - error = ENOBUFS; control = m_get(M_WAITOK, MT_CONTROL); MCLGET(control, M_WAITOK); Modified: head/sys/compat/linux/linux_stats.c ============================================================================== --- head/sys/compat/linux/linux_stats.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_stats.c Tue Sep 1 21:24:33 2020 (r365080) @@ -59,7 +59,6 @@ __FBSDID("$FreeBSD$"); #include #include - static void translate_vnhook_major_minor(struct vnode *vp, struct stat *sb) { Modified: head/sys/compat/linux/linux_time.c ============================================================================== --- head/sys/compat/linux/linux_time.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_time.c Tue Sep 1 21:24:33 2020 (r365080) @@ -122,7 +122,6 @@ LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, uns LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, unsupported_clockid, "int"); LIN_SDT_PROBE_DEFINE1(time, linux_clock_nanosleep, return, "int"); - int native_to_linux_timespec(struct l_timespec *ltp, struct timespec *ntp) { Modified: head/sys/compat/linux/linux_timer.c ============================================================================== --- head/sys/compat/linux/linux_timer.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_timer.c Tue Sep 1 21:24:33 2020 (r365080) @@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$"); #endif #include - static int linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig) { Modified: head/sys/compat/linux/linux_vdso.c ============================================================================== --- head/sys/compat/linux/linux_vdso.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linux/linux_vdso.c Tue Sep 1 21:24:33 2020 (r365080) @@ -65,7 +65,6 @@ static int __elfN(symstrindex); static void __elfN(linux_vdso_lookup)(Elf_Ehdr *, struct linux_vdso_sym *); - void __elfN(linux_vdso_sym_init)(struct linux_vdso_sym *s) { Modified: head/sys/compat/linuxkpi/common/include/asm/atomic-long.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic-long.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/asm/atomic-long.h Tue Sep 1 21:24:33 2020 (r365080) @@ -34,7 +34,6 @@ #include #include #include - #define ATOMIC_LONG_INIT(x) { .counter = (x) } typedef struct { Modified: head/sys/compat/linuxkpi/common/include/asm/atomic.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/asm/atomic.h Tue Sep 1 21:24:33 2020 (r365080) @@ -35,7 +35,6 @@ #include #include #include - #define ATOMIC_INIT(x) { .counter = (x) } typedef struct { Modified: head/sys/compat/linuxkpi/common/include/asm/atomic64.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/asm/atomic64.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/asm/atomic64.h Tue Sep 1 21:24:33 2020 (r365080) @@ -35,7 +35,6 @@ typedef struct { volatile int64_t counter; } atomic64_t; - #define ATOMIC64_INIT(x) { .counter = (x) } /*------------------------------------------------------------------------* Modified: head/sys/compat/linuxkpi/common/include/linux/compat.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/compat.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/compat.h Tue Sep 1 21:24:33 2020 (r365080) @@ -41,7 +41,6 @@ struct task_struct; extern int linux_alloc_current(struct thread *, int flags); extern void linux_free_current(struct task_struct *); - static inline void linux_set_current(struct thread *td) { Modified: head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/dma-attrs.h Tue Sep 1 21:24:33 2020 (r365080) @@ -45,7 +45,6 @@ struct dma_attrs { unsigned long flags; }; - #define DEFINE_DMA_ATTRS(x) struct dma_attrs x = { } static inline void Modified: head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/dma-mapping.h Tue Sep 1 21:24:33 2020 (r365080) @@ -276,7 +276,6 @@ static inline unsigned int dma_set_max_seg_size(struct return (0); } - #define dma_map_single(d, a, s, r) dma_map_single_attrs(d, a, s, r, NULL) #define dma_unmap_single(d, a, s, r) dma_unmap_single_attrs(d, a, s, r, NULL) #define dma_map_sg(d, s, n, r) dma_map_sg_attrs(d, s, n, r, NULL) Modified: head/sys/compat/linuxkpi/common/include/linux/dmapool.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/dmapool.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/dmapool.h Tue Sep 1 21:24:33 2020 (r365080) @@ -82,5 +82,4 @@ dma_pool_free(struct dma_pool *pool, void *vaddr, dma_ linux_dma_pool_free(pool, vaddr, dma_addr); } - #endif /* _LINUX_DMAPOOL_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/fs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/fs.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/fs.h Tue Sep 1 21:24:33 2020 (r365080) @@ -64,7 +64,6 @@ struct linux_cdev; #define S_IRUGO (S_IRUSR | S_IRGRP | S_IROTH) #define S_IWUGO (S_IWUSR | S_IWGRP | S_IWOTH) - typedef struct files_struct *fl_owner_t; struct file_operations; Modified: head/sys/compat/linuxkpi/common/include/linux/io.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/io.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/io.h Tue Sep 1 21:24:33 2020 (r365080) @@ -43,7 +43,6 @@ * XXX This is all x86 specific. It should be bus space access. */ - /* rmb and wmb are declared in machine/atomic.h, so should be included first. */ #ifndef __io_br #define __io_br() __compiler_membar() Modified: head/sys/compat/linuxkpi/common/include/linux/jhash.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/jhash.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/jhash.h Tue Sep 1 21:24:33 2020 (r365080) @@ -116,7 +116,6 @@ static inline u32 jhash2(const u32 *k, u32 length, u32 return c; } - /* A special ultra-optimized versions that knows they are hashing exactly * 3, 2 or 1 word(s). * Modified: head/sys/compat/linuxkpi/common/include/linux/kmod.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kmod.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/kmod.h Tue Sep 1 21:24:33 2020 (r365080) @@ -48,5 +48,4 @@ #define request_module_nowait request_module - #endif /* _LINUX_KMOD_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/kref.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/kref.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/kref.h Tue Sep 1 21:24:33 2020 (r365080) @@ -91,7 +91,6 @@ kref_put_lock(struct kref *kref, void (*rel)(struct kr return (0); } - static inline int kref_sub(struct kref *kref, unsigned int count, void (*rel)(struct kref *kref)) Modified: head/sys/compat/linuxkpi/common/include/linux/list.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/list.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/list.h Tue Sep 1 21:24:33 2020 (r365080) @@ -73,7 +73,6 @@ #ifndef prefetch #define prefetch(x) #endif - #define LINUX_LIST_HEAD_INIT(name) { &(name), &(name) } #define LINUX_LIST_HEAD(name) \ @@ -324,7 +323,6 @@ list_splice_tail_init(struct list_head *list, struct l #undef LIST_HEAD #define LIST_HEAD(name) struct list_head name = { &(name), &(name) } - struct hlist_head { struct hlist_node *first; }; @@ -332,7 +330,6 @@ struct hlist_head { struct hlist_node { struct hlist_node *next, **pprev; }; - #define HLIST_HEAD_INIT { } #define HLIST_HEAD(name) struct hlist_head name = HLIST_HEAD_INIT #define INIT_HLIST_HEAD(head) (head)->first = NULL Modified: head/sys/compat/linuxkpi/common/include/linux/pci.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/pci.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/pci.h Tue Sep 1 21:24:33 2020 (r365080) @@ -496,7 +496,6 @@ static inline int pci_pcie_cap(struct pci_dev *dev) return pci_find_capability(dev, PCI_CAP_ID_EXP); } - static inline int pci_read_config_byte(struct pci_dev *pdev, int where, u8 *val) { @@ -706,7 +705,6 @@ pci_iounmap(struct pci_dev *dev, void *res) #define DEFINE_PCI_DEVICE_TABLE(_table) \ const struct pci_device_id _table[] __devinitdata - /* XXX This should not be necessary. */ #define pcix_set_mmrbc(d, v) 0 #define pcix_get_max_mmrbc(d) 0 @@ -773,7 +771,6 @@ enum pci_ers_result { PCI_ERS_RESULT_RECOVERED = 5, }; - /* PCI bus error event callbacks */ struct pci_error_handlers { pci_ers_result_t (*error_detected)(struct pci_dev *dev, @@ -808,7 +805,6 @@ static inline u16 pcie_flags_reg(struct pci_dev *dev) return reg16; } - static inline int pci_pcie_type(struct pci_dev *dev) { Modified: head/sys/compat/linuxkpi/common/include/linux/scatterlist.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/scatterlist.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/scatterlist.h Tue Sep 1 21:24:33 2020 (r365080) @@ -479,5 +479,4 @@ sg_page_iter_page(struct sg_page_iter *piter) return (nth_page(sg_page(piter->sg), piter->sg_pgoffset)); } - #endif /* _LINUX_SCATTERLIST_H_ */ Modified: head/sys/compat/linuxkpi/common/include/linux/sysfs.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/linux/sysfs.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/linux/sysfs.h Tue Sep 1 21:24:33 2020 (r365080) @@ -57,7 +57,6 @@ struct attribute_group { #define __ATTR_RO(_name) __ATTR(_name, 0444, _name##_show, NULL) #define __ATTR_WO(_name) __ATTR(_name, 0200, NULL, _name##_store) #define __ATTR_RW(_name) __ATTR(_name, 0644, _name##_show, _name##_store) - #define __ATTR_NULL { .attr = { .name = NULL } } #define ATTRIBUTE_GROUPS(_name) \ Modified: head/sys/compat/linuxkpi/common/include/net/ipv6.h ============================================================================== --- head/sys/compat/linuxkpi/common/include/net/ipv6.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/include/net/ipv6.h Tue Sep 1 21:24:33 2020 (r365080) @@ -110,5 +110,4 @@ static inline int ipv6_addr_cmp(const struct in6_addr return memcmp(a1, a2, sizeof(struct in6_addr)); } - #endif /* _LINUX_NET_IPV6_H_ */ Modified: head/sys/compat/linuxkpi/common/src/linux_compat.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_compat.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_compat.c Tue Sep 1 21:24:33 2020 (r365080) @@ -206,7 +206,6 @@ kobject_add_complete(struct kobject *kobj, struct kobj } if (error) sysfs_remove_dir(kobj); - } return (error); } @@ -1012,7 +1011,6 @@ linux_poll_wakeup_state(atomic_t *v, const uint8_t *ps return (c); } - static int linux_poll_wakeup_callback(wait_queue_t *wq, unsigned int wq_state, int flags, void *key) { @@ -1835,7 +1833,6 @@ iounmap(void *addr) kfree(vmmap); } - void * vmap(struct page **pages, unsigned int count, unsigned long flags, int prot) { @@ -2002,7 +1999,7 @@ linux_timer_init(void *arg) linux_timer_hz_mask--; /* compute some internal constants */ - + lkpi_nsec2hz_rem = hz; lkpi_usec2hz_rem = hz; lkpi_msec2hz_rem = hz; Modified: head/sys/compat/linuxkpi/common/src/linux_hrtimer.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_hrtimer.c Tue Sep 1 21:24:33 2020 (r365080) @@ -120,4 +120,3 @@ linux_hrtimer_forward_now(struct hrtimer *hrtimer, kti nstosbt(hrtimer->precision), hrtimer_call_handler, hrtimer, 0); mtx_unlock(&hrtimer->mtx); } - Modified: head/sys/compat/linuxkpi/common/src/linux_idr.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_idr.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_idr.c Tue Sep 1 21:24:33 2020 (r365080) @@ -269,7 +269,6 @@ idr_remove(struct idr *idr, int id) return (res); } - static inline struct idr_layer * idr_find_layer_locked(struct idr *idr, int id) { Modified: head/sys/compat/linuxkpi/common/src/linux_kmod.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_kmod.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_kmod.c Tue Sep 1 21:24:33 2020 (r365080) @@ -32,4 +32,3 @@ __FBSDID("$FreeBSD$"); MODULE_VERSION(linuxkpi, 1); MODULE_DEPEND(linuxkpi, pci, 1, 1, 1); - Modified: head/sys/compat/linuxkpi/common/src/linux_pci.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_pci.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_pci.c Tue Sep 1 21:24:33 2020 (r365080) @@ -588,7 +588,6 @@ linux_dma_trie_free(struct pctrie *ptree, void *node) uma_zfree(linux_dma_trie_zone, node); } - PCTRIE_DEFINE(LINUX_DMA, linux_dma_obj, dma_addr, linux_dma_trie_alloc, linux_dma_trie_free); Modified: head/sys/compat/linuxkpi/common/src/linux_radix.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_radix.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_radix.c Tue Sep 1 21:24:33 2020 (r365080) @@ -206,7 +206,6 @@ radix_tree_insert(struct radix_tree_root *root, unsign /* expand radix tree as needed */ while (radix_max(root) < index) { - /* check if the radix tree is getting too big */ if (root->height == RADIX_TREE_MAX_HEIGHT) { radix_tree_clean_root_node(root); @@ -311,7 +310,6 @@ radix_tree_store(struct radix_tree_root *root, unsigne /* expand radix tree as needed */ while (radix_max(root) < index) { - /* check if the radix tree is getting too big */ if (root->height == RADIX_TREE_MAX_HEIGHT) { radix_tree_clean_root_node(root); Modified: head/sys/compat/linuxkpi/common/src/linux_rcu.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_rcu.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_rcu.c Tue Sep 1 21:24:33 2020 (r365080) @@ -167,7 +167,6 @@ linux_rcu_cleaner_func(void *context, int pending __un /* dispatch all callbacks, if any */ while ((rcu = STAILQ_FIRST(&tmp_head)) != NULL) { - STAILQ_REMOVE_HEAD(&tmp_head, entry); offset = (uintptr_t)rcu->func; Modified: head/sys/compat/linuxkpi/common/src/linux_seq_file.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_seq_file.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_seq_file.c Tue Sep 1 21:24:33 2020 (r365080) @@ -130,7 +130,6 @@ single_open(struct linux_file *f, int (*show)(struct s free(op, M_LSEQ); else ((struct seq_file *)f->private_data)->private = d; - } return (rc); } Modified: head/sys/compat/linuxkpi/common/src/linux_usb.c ============================================================================== --- head/sys/compat/linuxkpi/common/src/linux_usb.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/linuxkpi/common/src/linux_usb.c Tue Sep 1 21:24:33 2020 (r365080) @@ -147,7 +147,6 @@ usb_linux_lookup_id(const struct usb_device_id *id, st * array: */ for (; id->match_flags; id++) { - if ((id->match_flags & USB_DEVICE_ID_MATCH_VENDOR) && (id->idVendor != uaa->info.idVendor)) { continue; @@ -513,7 +512,6 @@ usb_unlink_urb_sub(struct urb *urb, uint8_t drain) uhe = urb->endpoint; if (urb->bsd_urb_list.tqe_prev) { - /* not started yet, just remove it from the queue */ TAILQ_REMOVE(&uhe->bsd_urb_list, urb, bsd_urb_list); urb->bsd_urb_list.tqe_prev = NULL; @@ -528,7 +526,6 @@ usb_unlink_urb_sub(struct urb *urb, uint8_t drain) (urb->complete) (urb); } } else { - /* * If the URB is not on the URB list, then check if one of * the FreeBSD USB transfer are processing the current URB. @@ -794,7 +791,6 @@ usb_setup_endpoint(struct usb_device *dev, memset(cfg, 0, sizeof(cfg)); if (type == UE_ISOCHRONOUS) { - /* * Isochronous transfers are special in that they don't fit * into the BULK/INTR/CONTROL transfer model. @@ -881,7 +877,6 @@ usb_linux_create_usb_device(struct usb_device *udev, d * and one pass to initialize all the allocated memory structures. */ for (pass = 0; pass < 2; pass++) { - iface_no_curr = 0xFFFF; niface_total = 0; iface_index = 0; @@ -893,7 +888,6 @@ usb_linux_create_usb_device(struct usb_device *udev, d * descriptor pointer provided by the FreeBSD USB stack. */ while ((desc = usb_desc_foreach(cd, desc))) { - /* * Build up a tree according to the descriptors we * find: @@ -957,7 +951,6 @@ usb_linux_create_usb_device(struct usb_device *udev, d } if (pass == 0) { - size = (sizeof(*p_uhe) * nedesc) + (sizeof(*p_ui) * iface_index) + (sizeof(*p_uhi) * niface_total); @@ -1357,7 +1350,6 @@ usb_linux_isoc_callback(struct usb_xfer *xfer, usb_err case USB_ST_TRANSFERRED: if (urb->bsd_isread) { - /* copy in data with regard to the URB */ offset = 0; @@ -1413,7 +1405,6 @@ usb_linux_isoc_callback(struct usb_xfer *xfer, usb_err tr_setup: if (xfer->priv_fifo == NULL) { - /* get next transfer */ urb = TAILQ_FIRST(&uhe->bsd_urb_list); if (urb == NULL) { @@ -1442,7 +1433,6 @@ tr_setup: usbd_xfer_set_frame_data(xfer, 0, urb->transfer_buffer, 0); } if (!(urb->bsd_isread)) { - /* copy out data with regard to the URB */ offset = 0; @@ -1458,7 +1448,6 @@ tr_setup: offset += uipd->length; } } else { - /* * compute the transfer length into the "offset" * variable @@ -1504,7 +1493,6 @@ tr_setup: return; } goto tr_setup; - } } @@ -1535,7 +1523,6 @@ usb_linux_non_isoc_callback(struct usb_xfer *xfer, usb case USB_ST_TRANSFERRED: if (xfer->flags_int.control_xfr) { - /* don't transfer the setup packet again: */ usbd_xfer_set_frame_len(xfer, 0, 0); @@ -1587,7 +1574,6 @@ tr_setup: xfer->timeout = urb->timeout; if (xfer->flags_int.control_xfr) { - /* * USB control transfers need special handling. * First copy in the header, then copy in data! @@ -1609,7 +1595,6 @@ tr_setup: urb->bsd_length_rem = ptr[6] | (ptr[7] << 8); } else { - /* setup data transfer direction */ urb->bsd_length_rem = urb->transfer_buffer_length; Modified: head/sys/compat/ndis/kern_ndis.c ============================================================================== --- head/sys/compat/ndis/kern_ndis.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/kern_ndis.c Tue Sep 1 21:24:33 2020 (r365080) @@ -102,7 +102,6 @@ static image_patch_table kernndis_functbl[] = { IMPORT_SFUNC(ndis_sendrsrcavail_func, 1), IMPORT_SFUNC(ndis_intrsetup, 4), IMPORT_SFUNC(ndis_return, 1), - { NULL, NULL, NULL } }; @@ -590,7 +589,6 @@ ndis_convert_res(arg) brl = BUS_GET_RESOURCE_LIST(dev, dev); if (brl != NULL) { - STAILQ_FOREACH(brle, brl, link) { switch (brle->type) { case SYS_RES_IOPORT: Modified: head/sys/compat/ndis/kern_windrv.c ============================================================================== --- head/sys/compat/ndis/kern_windrv.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/kern_windrv.c Tue Sep 1 21:24:33 2020 (r365080) @@ -798,7 +798,6 @@ _x86_64_call6(void *fn, uint64_t a, uint64_t b, uint64 } #endif /* __amd64__ */ - #ifdef __i386__ struct x86desc { Modified: head/sys/compat/ndis/ndis_var.h ============================================================================== --- head/sys/compat/ndis/ndis_var.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/ndis_var.h Tue Sep 1 21:24:33 2020 (r365080) @@ -294,7 +294,6 @@ typedef uint8_t ndis_kirql; #define NDIS_PNP_EVENT_STOPPED 4 #define NDIS_PNP_EVENT_PROFILECHANGED 5 - /* PnP/PM Statistics (Optional). */ #define OID_PNP_WAKE_UP_OK 0xFD020200 #define OID_PNP_WAKE_UP_ERROR 0xFD020201 @@ -674,7 +673,6 @@ typedef struct ndis_80211_enc_indication ndis_80211_en #define OID_TCP_TASK_IPSEC_DELETE_SA 0xFC010203 #define OID_TCP_SAN_SUPPORT 0xFC010204 - #define NDIS_TASK_OFFLOAD_VERSION 1 #define NDIS_TASK_TCPIP_CSUM 0x00000000 @@ -812,7 +810,6 @@ typedef enum ndis_media_state ndis_media_state; #define NDIS_PACKET_TYPE_FUNCTIONAL 0x00004000 #define NDIS_PACKET_TYPE_MAC_FRAME 0x00008000 - /* Ndis MAC option bits (OID_GEN_MAC_OPTIONS). */ #define NDIS_MAC_OPTION_COPY_LOOKAHEAD_DATA 0x00000001 @@ -1425,7 +1422,6 @@ struct ndis_map_arg { */ struct ndis_miniport_characteristics { - /* NDIS 3.0 */ uint8_t nmc_version_major; Modified: head/sys/compat/ndis/ntoskrnl_var.h ============================================================================== --- head/sys/compat/ndis/ntoskrnl_var.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/ntoskrnl_var.h Tue Sep 1 21:24:33 2020 (r365080) @@ -906,7 +906,6 @@ typedef struct devobj_extension devobj_extension; #define IOCTL_CODE(dev, func, iomethod, acc) \ ((dev) << 16) | (acc << 14) | (func << 2) | (iomethod)) - struct io_status_block { union { uint32_t isb_status; Modified: head/sys/compat/ndis/pe_var.h ============================================================================== --- head/sys/compat/ndis/pe_var.h Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/pe_var.h Tue Sep 1 21:24:33 2020 (r365080) @@ -164,7 +164,6 @@ typedef struct image_data_directory image_data_directo */ struct image_optional_header { - /* Standard fields */ uint16_t ioh_magic; @@ -502,7 +501,6 @@ extern uint32_t x86_stdcall_call(void *, int, ...); x86_stdcall_call(fn, 6, (a), (b), (c), (d), (e), (f)) #endif /* __i386__ */ - #define FUNC void(*)(void) Modified: head/sys/compat/ndis/subr_hal.c ============================================================================== --- head/sys/compat/ndis/subr_hal.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/subr_hal.c Tue Sep 1 21:24:33 2020 (r365080) @@ -478,6 +478,5 @@ image_patch_table hal_functbl[] = { { NULL, (FUNC)dummy, NULL, 0, WINDRV_WRAP_STDCALL }, /* End of list. */ - { NULL, NULL, NULL } }; Modified: head/sys/compat/ndis/subr_ndis.c ============================================================================== --- head/sys/compat/ndis/subr_ndis.c Tue Sep 1 21:23:59 2020 (r365079) +++ head/sys/compat/ndis/subr_ndis.c Tue Sep 1 21:24:33 2020 (r365080) @@ -50,7 +50,6 @@ __FBSDID("$FreeBSD$"); * expects. */ - #include *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***