From owner-svn-src-head@freebsd.org Mon Feb 24 19:50:29 2020 Return-Path: Delivered-To: svn-src-head@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 66166242068; Mon, 24 Feb 2020 19:50:29 +0000 (UTC) (envelope-from emaste@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) server-signature RSA-PSS (4096 bits) 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 48RCN51w0lz3Q9S; Mon, 24 Feb 2020 19:50:29 +0000 (UTC) (envelope-from emaste@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 3BCE02806; Mon, 24 Feb 2020 19:50:29 +0000 (UTC) (envelope-from emaste@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01OJoTHs049633; Mon, 24 Feb 2020 19:50:29 GMT (envelope-from emaste@FreeBSD.org) Received: (from emaste@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01OJoTqr049632; Mon, 24 Feb 2020 19:50:29 GMT (envelope-from emaste@FreeBSD.org) Message-Id: <202002241950.01OJoTqr049632@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: emaste set sender to emaste@FreeBSD.org using -f From: Ed Maste Date: Mon, 24 Feb 2020 19:50:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358300 - head/sys/dev/usb/net X-SVN-Group: head X-SVN-Commit-Author: emaste X-SVN-Commit-Paths: head/sys/dev/usb/net X-SVN-Commit-Revision: 358300 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Feb 2020 19:50:29 -0000 Author: emaste Date: Mon Feb 24 19:50:28 2020 New Revision: 358300 URL: https://svnweb.freebsd.org/changeset/base/358300 Log: smsc: remove pre-FreeBSD-10 compat support Sponsored by: The FreeBSD Foundation Modified: head/sys/dev/usb/net/if_smsc.c Modified: head/sys/dev/usb/net/if_smsc.c ============================================================================== --- head/sys/dev/usb/net/if_smsc.c Mon Feb 24 19:48:29 2020 (r358299) +++ head/sys/dev/usb/net/if_smsc.c Mon Feb 24 19:50:28 2020 (r358300) @@ -186,9 +186,7 @@ static miibus_readreg_t smsc_miibus_readreg; static miibus_writereg_t smsc_miibus_writereg; static miibus_statchg_t smsc_miibus_statchg; -#if __FreeBSD_version > 1000000 static int smsc_attach_post_sub(struct usb_ether *ue); -#endif static uether_fn_t smsc_attach_post; static uether_fn_t smsc_init; static uether_fn_t smsc_stop; @@ -233,9 +231,7 @@ static const struct usb_config smsc_config[SMSC_N_TRAN static const struct usb_ether_methods smsc_ue_methods = { .ue_attach_post = smsc_attach_post, -#if __FreeBSD_version > 1000000 .ue_attach_post_sub = smsc_attach_post_sub, -#endif .ue_start = smsc_start, .ue_ioctl = smsc_ioctl, .ue_init = smsc_init, @@ -920,24 +916,6 @@ smsc_init(struct usb_ether *ue) /* Cancel pending I/O */ smsc_stop(ue); -#if __FreeBSD_version <= 1000000 - /* On earlier versions this was the first place we could tell the system - * that we supported h/w csuming, however this is only called after the - * the interface has been brought up - not ideal. - */ - if (!(ifp->if_capabilities & IFCAP_RXCSUM)) { - ifp->if_capabilities |= IFCAP_RXCSUM; - ifp->if_capenable |= IFCAP_RXCSUM; - ifp->if_hwassist = 0; - } - - /* TX checksuming is disabled for now - ifp->if_capabilities |= IFCAP_TXCSUM; - ifp->if_capenable |= IFCAP_TXCSUM; - ifp->if_hwassist = CSUM_TCP | CSUM_UDP; - */ -#endif - /* Reset the ethernet interface. */ smsc_reset(sc); @@ -1551,11 +1529,7 @@ smsc_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data SMSC_UNLOCK(sc); if (reinit) -#if __FreeBSD_version > 1000000 uether_init(ue); -#else - ifp->if_init(ue); -#endif } else { rc = uether_ioctl(ifp, cmd, data); @@ -1637,7 +1611,6 @@ smsc_attach_post(struct usb_ether *ue) * RETURNS: * Returns 0 on success or a negative error code. */ -#if __FreeBSD_version > 1000000 static int smsc_attach_post_sub(struct usb_ether *ue) { @@ -1677,7 +1650,6 @@ smsc_attach_post_sub(struct usb_ether *ue) return (error); } -#endif /* __FreeBSD_version > 1000000 */ /**