Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4f73c8e authored by Francois Romieu's avatar Francois Romieu Committed by Jeff Garzik
Browse files

via-velocity: fix vlan receipt 



- vlans were using a single CAM register (see mac_set_vlan_cam)
- setting the address filtering registers for vlans is not
  needed when there is no vlan

The non-tagged interface is filtered out as soon as a tagged
(!= 0) interface is created. Its traffic appears again when an
zero-tagged interface is created.

Tested on Via Epia SN (VT6130 chipset) with several vlans whose
tag was above or beyond 255.

Signed-off-by: default avatarSéguier Régis <rseguier@e-teleport.net>
Acked-by: default avatarFrancois Romieu <romieu@fr.zoreil.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9f3f7910

drivers/net/via-velocity.c

+28 −18
Original line number Diff line number Diff line
@@ -605,7 +605,6 @@ static void __devinit velocity_get_options(struct velocity_opt *opts, int index, 
static void velocity_init_cam_filter(struct velocity_info *vptr)

{

	struct mac_regs __iomem * regs = vptr->mac_regs;

	unsigned short vid;



	/* Turn on MCFG_PQEN, turn off MCFG_RTGOPT */

	WORD_REG_BITS_SET(MCFG_PQEN, MCFG_RTGOPT, &regs->MCFG);
@@ -617,29 +616,33 @@ static void velocity_init_cam_filter(struct velocity_info *vptr) 
	mac_set_vlan_cam_mask(regs, vptr->vCAMmask);

	mac_set_cam_mask(regs, vptr->mCAMmask);



	/* Enable first VCAM */

	/* Enable VCAMs */

	if (vptr->vlgrp) {

		for (vid = 0; vid < VLAN_VID_MASK; vid++) {

			if (vlan_group_get_device(vptr->vlgrp, vid)) {

				/* If Tagging option is enabled and

				   VLAN ID is not zero, then

				   turn on MCFG_RTGOPT also */

				if (vid != 0)

		unsigned int vid, i = 0;



		if (!vlan_group_get_device(vptr->vlgrp, 0))

			WORD_REG_BITS_ON(MCFG_RTGOPT, &regs->MCFG);



				mac_set_vlan_cam(regs, 0, (u8 *) &vid);

		for (vid = 1; (vid < VLAN_VID_MASK); vid++) {

			if (vlan_group_get_device(vptr->vlgrp, vid)) {

				mac_set_vlan_cam(regs, i, (u8 *) &vid);

				vptr->vCAMmask[i / 8] |= 0x1 << (i % 8);

				if (++i >= VCAM_SIZE)

					break;

			}

		}

		vptr->vCAMmask[0] |= 1;

		mac_set_vlan_cam_mask(regs, vptr->vCAMmask);

	} else {

		u16 temp = 0;

		mac_set_vlan_cam(regs, 0, (u8 *) &temp);

		temp = 1;

		mac_set_vlan_cam_mask(regs, (u8 *) &temp);

	}

}



static void velocity_vlan_rx_register(struct net_device *dev,

				      struct vlan_group *grp)

{

	struct velocity_info *vptr = netdev_priv(dev);



	vptr->vlgrp = grp;

}



static void velocity_vlan_rx_add_vid(struct net_device *dev, unsigned short vid)

{

	struct velocity_info *vptr = netdev_priv(dev);
@@ -959,11 +962,13 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi 


	dev->vlan_rx_add_vid = velocity_vlan_rx_add_vid;

	dev->vlan_rx_kill_vid = velocity_vlan_rx_kill_vid;

	dev->vlan_rx_register = velocity_vlan_rx_register;



#ifdef  VELOCITY_ZERO_COPY_SUPPORT

	dev->features |= NETIF_F_SG;

#endif

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER;

	dev->features |= NETIF_F_HW_VLAN_TX | NETIF_F_HW_VLAN_FILTER |

		NETIF_F_HW_VLAN_RX;



	if (vptr->flags & VELOCITY_FLAGS_TX_CSUM)

		dev->features |= NETIF_F_IP_CSUM;
@@ -1597,9 +1602,14 @@ static int velocity_receive_frame(struct velocity_info *vptr, int idx) 
	skb_put(skb, pkt_len - 4);

	skb->protocol = eth_type_trans(skb, vptr->dev);



	stats->rx_bytes += pkt_len;

	if (vptr->vlgrp && (rd->rdesc0.RSR & RSR_DETAG)) {

		vlan_hwaccel_rx(skb, vptr->vlgrp,

				swab16(le16_to_cpu(rd->rdesc1.PQTAG)));

	} else

		netif_rx(skb);



	stats->rx_bytes += pkt_len;



	return 0;

}