From b37ebf4938a078febcc6b5060542a8079574970b Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Mon, 26 Jan 2009 14:33:23 -0800 Subject: [PATCH] --- yaml --- r: 130207 b: refs/heads/master c: cd1f55a5b49b74e13ed9e7bc74d005803aaa0da8 h: refs/heads/master i: 130205: 94038e04f0b716c38620deb3aadf9fac17805bcb 130203: 90dc6e46ba14cbba1a1c9d2437bccb4ac7269bb3 130199: a12ec9503bd56d550c33c18e41c82eda6aba88ad 130191: ec46692888f01cf9dbe66c0d28fc7a12fb7d3b4d 130175: 84f8b348eabeba748a5051e789d95fc58e6eb0b4 v: v3 --- [refs] | 2 +- trunk/drivers/net/gianfar.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) 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 */