Re: Problem with VLANs and via-velocity driver

[Tiago Pierezan Camargo <tcamargo@gmail.com>]

Patrick McHardy <kaber <at> trash.net> writes:
> > ...
> >
> > Any suggestions?
>
> This should be fixed in the driver as discussed previously.

Well, the following patch completely disables hw vlan filtering
(against 2.6.31).

--- ../via_kernel_org/via-velocity.c	2010-02-10 11:45:14.000000000 -0200
+++ via-velocity.c	2010-02-11 11:24:37.000000000 -0200
@@ -607,9 +607,10 @@
 {
 	struct mac_regs __iomem * regs = vptr->mac_regs;

-	/* Turn on MCFG_PQEN, turn off MCFG_RTGOPT */
-	WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, &regs->MCFG);
-	WORD_REG_BITS_ON(MCFG_VIDFR, &regs->MCFG);
+	/* Completely disable vlan filtering */
+	WORD_REG_BITS_OFF(MCFG_PQEN, &regs->MCFG);
+	WORD_REG_BITS_OFF(MCFG_VIDFR, &regs->MCFG);
+	WORD_REG_BITS_OFF(MCFG_RTGOPT, &regs->MCFG);

 	/* Disable all CAMs */
 	memset(vptr->vCAMmask, 0, sizeof(u8) * 8);
@@ -1406,7 +1407,7 @@
 		/*
 		 *	Don't drop CE or RL error frame although RXOK is off
 		 */
-		if (rd->rdesc0.RSR & (RSR_RXOK | RSR_CE | RSR_RL)) {
+		if (rd->rdesc0.RSR & (RSR_RXOK | RSR_CE | RSR_RL | RSR_VIDM)) {
 			if (velocity_receive_frame(vptr, rd_curr) < 0)
 				stats->rx_dropped++;

I know it's not the best solution. I can come up with a better patch
but I'm a bit confused about the expected behavior.

- Should we only disable vlan filtering when promiscuous mode is
enabled? (should we care about hw tag stripping?)
- Should we disable vlan filtering entirely and let the software deal
with it? (this seems to be the semantics implemented in the freebsd
driver)

Suggestions?

Regards,

-- 
Tiago Pierezan Camargo
tcamargo at gmail dot com