From owner-svn-src-projects@FreeBSD.ORG Fri Apr 24 19:51:05 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6889FB7; Fri, 24 Apr 2015 19:51:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCABD1ABF; Fri, 24 Apr 2015 19:51:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3OJp5ZU080441; Fri, 24 Apr 2015 19:51:05 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3OJp4Lw080429; Fri, 24 Apr 2015 19:51:04 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201504241951.t3OJp4Lw080429@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Fri, 24 Apr 2015 19:51:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281948 - in projects/ifnet/sys/dev: alc bge msk re X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2015 19:51:06 -0000 Author: glebius Date: Fri Apr 24 19:51:04 2015 New Revision: 281948 URL: https://svnweb.freebsd.org/changeset/base/281948 Log: Followup on r281227. If we put the mbuf on queue, we must not return an error, even of link is down. Returning an error now means give the mbuf back to stack. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/ifnet/sys/dev/alc/if_alc.c projects/ifnet/sys/dev/bge/if_bge.c projects/ifnet/sys/dev/msk/if_msk.c projects/ifnet/sys/dev/re/if_re.c Modified: projects/ifnet/sys/dev/alc/if_alc.c ============================================================================== --- projects/ifnet/sys/dev/alc/if_alc.c Fri Apr 24 19:26:01 2015 (r281947) +++ projects/ifnet/sys/dev/alc/if_alc.c Fri Apr 24 19:51:04 2015 (r281948) @@ -2881,9 +2881,9 @@ alc_transmit(if_t ifp, struct mbuf *m) sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); ALC_LOCK(sc); - error = alc_start(sc); + (void )alc_start(sc); ALC_UNLOCK(sc); - return (error); + return (0); } static int Modified: projects/ifnet/sys/dev/bge/if_bge.c ============================================================================== --- projects/ifnet/sys/dev/bge/if_bge.c Fri Apr 24 19:26:01 2015 (r281947) +++ projects/ifnet/sys/dev/bge/if_bge.c Fri Apr 24 19:51:04 2015 (r281948) @@ -5398,9 +5398,9 @@ bge_transmit(if_t ifp, struct mbuf *m) sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); BGE_LOCK(sc); - error = bge_start_locked(sc); + (void )bge_start_locked(sc); BGE_UNLOCK(sc); - return (error); + return (0); } static void Modified: projects/ifnet/sys/dev/msk/if_msk.c ============================================================================== --- projects/ifnet/sys/dev/msk/if_msk.c Fri Apr 24 19:26:01 2015 (r281947) +++ projects/ifnet/sys/dev/msk/if_msk.c Fri Apr 24 19:51:04 2015 (r281948) @@ -2894,9 +2894,9 @@ msk_transmit(if_t ifp, struct mbuf *m) sc_if = if_getsoftc(ifp, IF_DRIVER_SOFTC); MSK_IF_LOCK(sc_if); - error = msk_start(sc_if); + (void )msk_start(sc_if); MSK_IF_UNLOCK(sc_if); - return (error); + return (0); } static int Modified: projects/ifnet/sys/dev/re/if_re.c ============================================================================== --- projects/ifnet/sys/dev/re/if_re.c Fri Apr 24 19:26:01 2015 (r281947) +++ projects/ifnet/sys/dev/re/if_re.c Fri Apr 24 19:51:04 2015 (r281948) @@ -2918,9 +2918,9 @@ re_transmit(if_t ifp, struct mbuf *m) sc = if_getsoftc(ifp, IF_DRIVER_SOFTC); RL_LOCK(sc); - error = re_start(sc); + (void )re_start(sc); RL_UNLOCK(sc); - return (error); + return (0); } static int