Date: Sat, 14 Jan 2006 15:43:25 -0500 From: John Baldwin <jhb@freebsd.org> To: Doug Barton <dougb@freebsd.org> Cc: cvs-src@freebsd.org, Gleb Smirnoff <glebius@freebsd.org>, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/sys/dev/bge if_bge.c src/sys/dev/em if_em.c src/sys/dev/ixgb if_ixgb.c src/sys/dev/nge if_nge.c src/sys/dev/re if_re.c src/sys/dev/txp if_txp.c src/sys/dev/vge if_vge.c src/sys/net if_vlan.c if_vlan_var.h src/sys/net80211 ... Message-ID: <200601141543.27356.jhb@freebsd.org> In-Reply-To: <43C8692A.9040301@FreeBSD.org> References: <200601131151.k0DBpDhC039336@repoman.freebsd.org> <43C8692A.9040301@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday 13 January 2006 09:59 pm, Doug Barton wrote: > Gleb Smirnoff wrote: > > glebius 2006-01-13 11:51:11 UTC > > > > FreeBSD src repository > > > > Modified files: (Branch: RELENG_6) > > sys/dev/bge if_bge.c > > sys/dev/em if_em.c > > sys/dev/ixgb if_ixgb.c > > sys/dev/nge if_nge.c > > sys/dev/re if_re.c > > sys/dev/txp if_txp.c > > sys/dev/vge if_vge.c > > sys/net if_vlan.c if_vlan_var.h > > sys/net80211 ieee80211_input.c > > sys/pci if_ti.c > > Log: > > MFC: > > - Use VLAN_TAG_VALUE() not only to read a dot1q tag > > value from an m_tag, but also to set it. This reduces > > complex code duplication and improves its readability. > > - Fix VLAN_INPUT_TAG() macro, so that it doesn't touch mtag in > > case if memory allocation failed. > > - Remove fourth argument from VLAN_INPUT_TAG(), that was used > > incorrectly in almost all drivers. Indicate failure with > > mbuf value of NULL. > > > > Revision Changes Path > > 1.91.2.7 +5 -2 src/sys/dev/bge/if_bge.c > > 1.65.2.11 +1 -3 src/sys/dev/em/if_em.c > > 1.10.2.5 +1 -2 src/sys/dev/ixgb/if_ixgb.c > > 1.75.2.5 +3 -1 src/sys/dev/nge/if_nge.c > > 1.46.2.11 +5 -2 src/sys/dev/re/if_re.c > > 1.31.2.4 +3 -2 src/sys/dev/txp/if_txp.c > > 1.14.2.5 +5 -2 src/sys/dev/vge/if_vge.c > > 1.79.2.7 +1 -1 src/sys/net/if_vlan.c > > 1.21.2.1 +13 -7 src/sys/net/if_vlan_var.h > > 1.62.2.6 +3 -2 src/sys/net80211/ieee80211_input.c > > 1.107.2.4 +5 -2 src/sys/pci/if_ti.c > > > > According to the tinderboxes, this breaks the build on RELENG_6. Did you > test this? I'm not sure that's quite fair. :) What happened is that his original patch did work fine (and has been in HEAD for a while), but it changed the API, so he did a quick fixup to restore the API in RELENG_6 and missed one file during that subsequent update. -- John Baldwin <jhb@FreeBSD.org> <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601141543.27356.jhb>