[PATCH] Part 2 of low level 802.1p priority support

[Pyun YongHyeon]

On Sat, Feb 10, 2007 at 06:28:41PM +0000, Bruce M. Simpson wrote:
 > This updated patch moves VLAN tag decapsulation into if_ethersubr.c and 
 > always uses M_VLANTAG, which is also passed to the upper layer.
 > 
 > Tests with ping:
 > fxp (no VLAN_HWTAGGING support)      OK
 > msk (VLAN_HWTAGGING enabled)         OK
 > msk (VLAN_HWTAGGING disanabled)     FAIL
 > 
 > I am concerned that this may need review and testing to support 
 > situations where we do nested VLANs or with bridge(4) before it can be 
 > committed.
 > 
 > Further testing with drivers is needed (I can't be 100% sure it fails 
 > with msk(4) because something strange is happening when vlan tagging is 
 > turned off). Perhaps Pyun knows?
 > 

I guess I've not merged local changes before committing to HEAD.
How about attached one?

 > Regards,
 > BMS
 > 
 > 

-- 
Regards,
Pyun YongHyeon
-------------- next part --------------
Index: if_msk.c
===================================================================
RCS file: /home/ncvs/src/sys/dev/msk/if_msk.c,v
retrieving revision 1.8
diff -u -r1.8 if_msk.c
--- if_msk.c	9 Jan 2007 01:31:22 -0000	1.8
+++ if_msk.c	11 Feb 2007 07:26:08 -0000
@@ -3029,7 +3029,8 @@
 	cons = sc_if->msk_cdata.msk_rx_cons;
 	do {
 		rxlen = status >> 16;
-		if ((status & GMR_FS_VLAN) != 0)
+		if ((status & GMR_FS_VLAN) != 0 &&
+		    (ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0)
 			rxlen -= ETHER_VLAN_ENCAP_LEN;
 		if (len > sc_if->msk_framesize ||
 		    ((status & GMR_FS_ANY_ERR) != 0) ||