On Tue, Aug 21, 2018 at 02:28:27PM -0700, Navdeep Parhar wrote: N> On 8/21/18 2:26 PM, Gleb Smirnoff wrote: N> > Navdeep, N> > N> > On Thu, Aug 16, 2018 at 11:46:38PM +0000, Navdeep Parhar wrote: N> > N> Author: np N> > N> Date: Thu Aug 16 23:46:38 2018 N> > N> New Revision: 337932 N> > N> URL: https://svnweb.freebsd.org/changeset/base/337932 N> > N> N> > N> Log: N> > N> Add the ability to look up the 3b PCP of a VLAN interface. Use it in N> > N> toe_l2_resolve to fill up the complete vtag and not just the vid. N> > N> N> > N> Reviewed by: kib@ N> > N> MFC after: 1 week N> > N> Sponsored by: Chelsio Communications N> > N> Differential Revision: https://reviews.freebsd.org/D16752 N> > ... N> > N> +static int N> > N> +vlan_pcp(struct ifnet *ifp, uint16_t *pcpp) N> > N> +{ N> > N> + struct ifvlan *ifv; N> > N> + N> > N> + if (ifp->if_type != IFT_L2VLAN) N> > N> + return (EINVAL); N> > N> + ifv = ifp->if_softc; N> > N> + *pcpp = ifv->ifv_pcp; N> > N> + return (0); N> > N> +} N> > N> > Is there any good reason not to assert that ifp->if_type == IFT_L2VLAN? N> > N> N> I can't think of any. But I wrote it this way to match the vlan_tag() N> function a few lines above.
Hmm, this comes from OFED import. But at the same time it brings macros like this: + (_ifp)->if_type == IFT_L2VLAN ? (*vlan_trunkdev_p)((_ifp)) : NULL +#define VLAN_TAG(_ifp, _tag) \ + (_ifp)->if_type == IFT_L2VLAN ? (*vlan_tag_p)((_ifp), (_tag)) : EINVAL +#define VLAN_COOKIE(_ifp) \ + (_ifp)->if_type == IFT_L2VLAN ? (*vlan_cookie_p)((_ifp)) : NULL +#define VLAN_SETCOOKIE(_ifp, _cookie) \ + (_ifp)->if_type == IFT_L2VLAN ? \ + (*vlan_setcookie_p)((_ifp), (_cookie)) : EINVAL +#define VLAN_DEVAT(_ifp, _tag) \ + (_ifp)->if_vlantrunk != NULL ? (*vlan_devat_p)((_ifp), (_tag)) : NULL I think it is entirely safe to convert these checks inside functions into assertions. -- Gleb Smirnoff _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
