diff options
| author | David S. Miller <davem@davemloft.net> | 2005-08-09 19:34:12 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2005-08-29 15:32:25 -0700 |
| commit | f2ccd8fa06c8e302116e71df372f5c1f83432e03 (patch) | |
| tree | 6e933f4bdc8899009edb33642b908779f123fb4a /net/ipx | |
| parent | b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 (diff) | |
| download | kernel_goldelico_gta04-f2ccd8fa06c8e302116e71df372f5c1f83432e03.zip kernel_goldelico_gta04-f2ccd8fa06c8e302116e71df372f5c1f83432e03.tar.gz kernel_goldelico_gta04-f2ccd8fa06c8e302116e71df372f5c1f83432e03.tar.bz2 | |
[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/ipx')
| -rw-r--r-- | net/ipx/af_ipx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipx/af_ipx.c b/net/ipx/af_ipx.c index 5a27e5d..3a13c5d 100644 --- a/net/ipx/af_ipx.c +++ b/net/ipx/af_ipx.c @@ -1627,7 +1627,7 @@ out: return rc; } -static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt) +static int ipx_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) { /* NULL here for pt means the packet was looped back */ struct ipx_interface *intrfc; |