lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
David S. Miller
2009-01-26 17:43:16 -08:00
parent dd0a251c8e 5376071069
commit 3eacdf58c2
899 changed files with 11944 additions and 5490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/gianfar.c
View File

@@ -1423,15 +1423,11 @@ static void gfar_vlan_rx_register(struct net_device *dev,
{
struct gfar_private *priv = netdev_priv(dev);
unsigned long flags;
struct vlan_group *old_grp;
u32 tempval;
spin_lock_irqsave(&priv->rxlock, flags);
old_grp = priv->vlgrp;
if (old_grp == grp)
return;
priv->vlgrp = grp;
if (grp) {
/* Enable VLAN tag insertion */