On Tue, Jul 26, 2005 at 10:52:48PM +0000, David Young wrote:
> 
> Module Name:	src
> Committed By:	dyoung
> Date:		Tue Jul 26 22:52:48 UTC 2005
> 
> Modified Files:
> 	src/sys/dev/ic: ath.c athioctl.h athrate-amrr.c athrate-onoe.c athvar.h
> 	src/sys/net80211: ieee80211.c ieee80211.h ieee80211_acl.c
> 	    ieee80211_crypto.c ieee80211_crypto.h ieee80211_crypto_ccmp.c
> 	    ieee80211_crypto_none.c ieee80211_crypto_tkip.c
> 	    ieee80211_crypto_wep.c ieee80211_input.c ieee80211_ioctl.c
> 	    ieee80211_ioctl.h ieee80211_netbsd.c ieee80211_netbsd.h
> 	    ieee80211_node.c ieee80211_node.h ieee80211_output.c
> 	    ieee80211_proto.c ieee80211_proto.h ieee80211_radiotap.h
> 	    ieee80211_rssadapt.c ieee80211_rssadapt.h ieee80211_sysctl.h
> 	    ieee80211_var.h ieee80211_xauth.c
> 	src/sys/sys: mbuf.h
> 
> Log Message:
> Resolve conflicts.

Huh, revolve conflicts for sys/sys/mbuf.h?

Hmmm, you just added another link layer specific flag:

#define       M_LINK3         0x8000  /* link layer specific flag */

Is there no other way then to add this new flag?

If not then we need to change the man pages to document it and the other link
flags too.
link0, link1 and link2 are also undocumented in ath(4).

Bernd