@@ -2422,7 +2422,6 @@ int netif_receive_skb(struct sk_buff *skb)
struct packet_type *ptype, *pt_prev;
struct net_device *orig_dev;
struct net_device *null_or_orig;
- struct net_device *null_or_bond;
int ret = NET_RX_DROP;
__be16 type;
@@ -2494,17 +2493,18 @@ ncls:
* device that may have registered for a specific ptype. The
* handler will have to adjust skb->dev and orig_dev though.
*/
- null_or_bond = NULL;
if ((skb->dev->priv_flags & IFF_802_1Q_VLAN) &&
(vlan_dev_real_dev(skb->dev)->priv_flags & IFF_BONDING)) {
- null_or_bond = vlan_dev_real_dev(skb->dev);
+ if (null_or_orig)
+ printk(KERN_ERR "BAD: n_o_o %p %s\n", null_or_orig,
+ null_or_orig->name);
+ null_or_orig = vlan_dev_real_dev(skb->dev);
}
type = skb->protocol;
list_for_each_entry_rcu(ptype,
&ptype_base[ntohs(type) & PTYPE_HASH_MASK], list) {
- if (ptype->type == type &&
- (ptype->dev == null_or_orig || ptype->dev == null_or_bond ||
+ if (ptype->type == type && (ptype->dev == null_or_orig ||
ptype->dev == skb->dev || ptype->dev == orig_dev)) {
if (pt_prev)
ret = deliver_skb(skb, pt_prev, orig_dev);