diff options
author | Patrick McHardy <kaber@trash.net> | 2008-01-21 03:22:30 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:27 -0500 |
commit | 62f99efce61024f1c645c2c574882b510c77c579 (patch) | |
tree | 00ea59ea721bce6446ab00c38e85a761858ecc72 /net/8021q | |
parent | ef3eb3e59bd5723895b2349edec98998198ef5bb (diff) |
[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>
Diffstat (limited to 'net/8021q')
-rw-r--r-- | net/8021q/vlan_dev.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index 51ce4217c039..50d8edcbb897 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, | |||
181 | /* Take off the VLAN header (4 bytes currently) */ | 181 | /* Take off the VLAN header (4 bytes currently) */ |
182 | skb_pull_rcsum(skb, VLAN_HLEN); | 182 | skb_pull_rcsum(skb, VLAN_HLEN); |
183 | 183 | ||
184 | /* Ok, lets check to make sure the device (dev) we | ||
185 | * came in on is what this VLAN is attached to. | ||
186 | */ | ||
187 | |||
188 | if (dev != VLAN_DEV_INFO(skb->dev)->real_dev) { | ||
189 | rcu_read_unlock(); | ||
190 | |||
191 | #ifdef VLAN_DEBUG | ||
192 | printk(VLAN_DBG "%s: dropping skb: %p because came in on wrong device, dev: %s real_dev: %s, skb_dev: %s\n", | ||
193 | __FUNCTION__, skb, dev->name, | ||
194 | VLAN_DEV_INFO(skb->dev)->real_dev->name, | ||
195 | skb->dev->name); | ||
196 | #endif | ||
197 | kfree_skb(skb); | ||
198 | stats->rx_errors++; | ||
199 | return -1; | ||
200 | } | ||
201 | |||
202 | /* | 184 | /* |
203 | * Deal with ingress priority mapping. | 185 | * Deal with ingress priority mapping. |
204 | */ | 186 | */ |