summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2008-01-21 00:22:30 -0800
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:08:27 -0800
commit62f99efce61024f1c645c2c574882b510c77c579 (patch)
tree00ea59ea721bce6446ab00c38e85a761858ecc72
parentef3eb3e59bd5723895b2349edec98998198ef5bb (diff)
downloadop-kernel-dev-62f99efce61024f1c645c2c574882b510c77c579.zip
op-kernel-dev-62f99efce61024f1c645c2c574882b510c77c579.tar.gz
[VLAN]: Kill useless check
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>
-rw-r--r--net/8021q/vlan_dev.c18
1 files changed, 0 insertions, 18 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c
index 51ce421..50d8edc 100644
--- a/net/8021q/vlan_dev.c
+++ b/net/8021q/vlan_dev.c
@@ -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.
*/
OpenPOWER on IntegriCloud