From owner-svn-src-head@freebsd.org Sun Mar 1 23:01:47 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 C3A4E251073; Sun, 1 Mar 2020 23:01:47 +0000 (UTC) (envelope-from imp@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 48VzL34sFfz47Ht; Sun, 1 Mar 2020 23:01:47 +0000 (UTC) (envelope-from imp@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 9E1E3B073; Sun, 1 Mar 2020 23:01:47 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 021N1l5h084794; Sun, 1 Mar 2020 23:01:47 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 021N1ljn084793; Sun, 1 Mar 2020 23:01:47 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202003012301.021N1ljn084793@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 1 Mar 2020 23:01:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r358508 - head/sys/cam/ctl X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/cam/ctl X-SVN-Commit-Revision: 358508 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: Sun, 01 Mar 2020 23:01:47 -0000 Author: imp Date: Sun Mar 1 23:01:47 2020 New Revision: 358508 URL: https://svnweb.freebsd.org/changeset/base/358508 Log: Remove pre-FreeBSD 11 compat code. Modified: head/sys/cam/ctl/ctl_ha.c Modified: head/sys/cam/ctl/ctl_ha.c ============================================================================== --- head/sys/cam/ctl/ctl_ha.c Sun Mar 1 23:01:37 2020 (r358507) +++ head/sys/cam/ctl/ctl_ha.c Sun Mar 1 23:01:47 2020 (r358508) @@ -66,68 +66,6 @@ __FBSDID("$FreeBSD$"); #include #include -#if (__FreeBSD_version < 1100000) -struct mbufq { - struct mbuf *head; - struct mbuf *tail; -}; - -static void -mbufq_init(struct mbufq *q, int limit) -{ - - q->head = q->tail = NULL; -} - -static void -mbufq_drain(struct mbufq *q) -{ - struct mbuf *m; - - while ((m = q->head) != NULL) { - q->head = m->m_nextpkt; - m_freem(m); - } - q->tail = NULL; -} - -static struct mbuf * -mbufq_dequeue(struct mbufq *q) -{ - struct mbuf *m; - - m = q->head; - if (m) { - if (q->tail == m) - q->tail = NULL; - q->head = m->m_nextpkt; - m->m_nextpkt = NULL; - } - return (m); -} - -static void -mbufq_enqueue(struct mbufq *q, struct mbuf *m) -{ - - m->m_nextpkt = NULL; - if (q->tail) - q->tail->m_nextpkt = m; - else - q->head = m; - q->tail = m; -} - -static u_int -sbavail(struct sockbuf *sb) -{ - return (sb->sb_cc); -} - -#if (__FreeBSD_version < 1000000) -#define mtodo(m, o) ((void *)(((m)->m_data) + (o))) -#endif -#endif struct ha_msg_wire { uint32_t channel;