[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>
This commit is contained in:
committed by
David S. Miller
parent
b6b99eb540
commit
f2ccd8fa06
@@ -700,7 +700,7 @@ void arp_send(int type, int ptype, u32 dest_ip,
|
||||
static void parp_redo(struct sk_buff *skb)
|
||||
{
|
||||
nf_reset(skb);
|
||||
arp_rcv(skb, skb->dev, NULL);
|
||||
arp_rcv(skb, skb->dev, NULL, skb->dev);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -927,7 +927,7 @@ out:
|
||||
* Receive an arp request from the device layer.
|
||||
*/
|
||||
|
||||
int arp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt)
|
||||
int arp_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev)
|
||||
{
|
||||
struct arphdr *arp;
|
||||
|
||||
|
Reference in New Issue
Block a user