diff options
author | David S. Miller <davem@davemloft.net> | 2005-08-09 22:34:12 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 18:32:25 -0400 |
commit | f2ccd8fa06c8e302116e71df372f5c1f83432e03 (patch) | |
tree | 6e933f4bdc8899009edb33642b908779f123fb4a /net/netrom/nr_dev.c | |
parent | b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 (diff) |
[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>
Diffstat (limited to 'net/netrom/nr_dev.c')
-rw-r--r-- | net/netrom/nr_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c index 220bf7494f7..83eb41d9b93 100644 --- a/net/netrom/nr_dev.c +++ b/net/netrom/nr_dev.c | |||
@@ -64,7 +64,7 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev) | |||
64 | skb->nh.raw = skb->data; | 64 | skb->nh.raw = skb->data; |
65 | skb->pkt_type = PACKET_HOST; | 65 | skb->pkt_type = PACKET_HOST; |
66 | 66 | ||
67 | ip_rcv(skb, skb->dev, NULL); | 67 | ip_rcv(skb, skb->dev, NULL, skb->dev); |
68 | 68 | ||
69 | return 1; | 69 | return 1; |
70 | } | 70 | } |