Date: Fri, 24 Apr 2015 19:51:04 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r281948 - in projects/ifnet/sys/dev: alc bge msk re Message-ID: <201504241951.t3OJp4Lw080429@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504241951.t3OJp4Lw080429>