Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 130207
b: refs/heads/master
c: cd1f55a
h: refs/heads/master
i:
  130205: 94038e0
  130203: 90dc6e4
  130199: a12ec95
  130191: ec46692
  130175: 84f8b34
v: v3
  • Loading branch information
Anton Vorontsov authored and David S. Miller committed Jan 26, 2009
1 parent 8fdeae4 commit b37ebf4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 116cb42855fbd052fc8cd2ca3e06050bff762673
refs/heads/master: cd1f55a5b49b74e13ed9e7bc74d005803aaa0da8
6 changes: 1 addition & 5 deletions trunk/drivers/net/gianfar.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit b37ebf4

Please sign in to comment.