Skip to content

Commit

Permalink
[VLAN]: Kill useless check
Browse files Browse the repository at this point in the history
vlan->real_dev is always equal to the device since thats what we used
for the lookup. It doesn't even seem worth a WARN_ON or BUG_ON.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Patrick McHardy authored and David S. Miller committed Jan 28, 2008
1 parent ef3eb3e commit 62f99ef
Showing 1 changed file with 0 additions and 18 deletions.
18 changes: 0 additions & 18 deletions net/8021q/vlan_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,24 +181,6 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev,
/* Take off the VLAN header (4 bytes currently) */
skb_pull_rcsum(skb, VLAN_HLEN);

/* Ok, lets check to make sure the device (dev) we
* came in on is what this VLAN is attached to.
*/

if (dev != VLAN_DEV_INFO(skb->dev)->real_dev) {
rcu_read_unlock();

#ifdef VLAN_DEBUG
printk(VLAN_DBG "%s: dropping skb: %p because came in on wrong device, dev: %s real_dev: %s, skb_dev: %s\n",
__FUNCTION__, skb, dev->name,
VLAN_DEV_INFO(skb->dev)->real_dev->name,
skb->dev->name);
#endif
kfree_skb(skb);
stats->rx_errors++;
return -1;
}

/*
* Deal with ingress priority mapping.
*/
Expand Down

0 comments on commit 62f99ef

Please sign in to comment.