diff --git a/[refs] b/[refs] index 6ccd297a7e49..ebcd581ccf82 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 116cb42855fbd052fc8cd2ca3e06050bff762673 +refs/heads/master: cd1f55a5b49b74e13ed9e7bc74d005803aaa0da8 diff --git a/trunk/drivers/net/gianfar.c b/trunk/drivers/net/gianfar.c index ea530673236e..3f7eab42aef1 100644 --- a/trunk/drivers/net/gianfar.c +++ b/trunk/drivers/net/gianfar.c @@ -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 */