[NET]: Kill skb->real_dev

Bonding just wants the device before the skb_bond()
decapsulation occurs, so simply pass that original
device into packet_type->func() as an argument.

It remains to be seen whether we can use this same
exact thing to get rid of skb->input_dev as well.

Signed-off-by: David S. Miller <davem@davemloft.net>
Bu işleme şunda yer alıyor:
David S. Miller
2005-08-09 19:34:12 -07:00
işlemeyi yapan: David S. Miller
ebeveyn b6b99eb540
işleme f2ccd8fa06
45 değiştirilmiş dosya ile 96 ekleme ve 91 silme

Dosyayı Görüntüle

@@ -2419,22 +2419,19 @@ out:
return 0;
}
int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype)
int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev)
{
struct bonding *bond = dev->priv;
struct slave *slave = NULL;
int ret = NET_RX_DROP;
if (!(dev->flags & IFF_MASTER)) {
if (!(dev->flags & IFF_MASTER))
goto out;
}
read_lock(&bond->lock);
slave = bond_get_slave_by_dev((struct bonding *)dev->priv,
skb->real_dev);
if (slave == NULL) {
slave = bond_get_slave_by_dev((struct bonding *)dev->priv, orig_dev);
if (!slave)
goto out_unlock;
}
bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);