From bd78d8d14a372b6b81a74e9f700f69d8a66808f4 Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Mon, 21 Jan 2008 00:22:30 -0800 Subject: [PATCH] --- yaml --- r: 79303 b: refs/heads/master c: 62f99efce61024f1c645c2c574882b510c77c579 h: refs/heads/master i: 79301: 97e40c3c334f8aa805d9bef1a04939d1d43d15ba 79299: 2a8fc27c56561d82963b39f78a59e849022f4b06 79295: c42b278a82d52e2a8774675ae371ac7a93dbe924 v: v3 --- [refs] | 2 +- trunk/net/8021q/vlan_dev.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index c947c62bd13d..148c4b64538b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef3eb3e59bd5723895b2349edec98998198ef5bb +refs/heads/master: 62f99efce61024f1c645c2c574882b510c77c579 diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c index 51ce4217c039..50d8edcbb897 100644 --- a/trunk/net/8021q/vlan_dev.c +++ b/trunk/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. */