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 /include/net/x25.h | |
| parent | b6b99eb5409d75ae35390057cd28f3aedfbd4cf4 (diff) | |
| download | linux-f2ccd8fa06c8e302116e71df372f5c1f83432e03.tar.gz linux-f2ccd8fa06c8e302116e71df372f5c1f83432e03.tar.bz2 linux-f2ccd8fa06c8e302116e71df372f5c1f83432e03.zip | |
[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 'include/net/x25.h')
| -rw-r--r-- | include/net/x25.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/x25.h b/include/net/x25.h index 8b39b98876e8..fee62ff8c194 100644 --- a/include/net/x25.h +++ b/include/net/x25.h @@ -175,7 +175,7 @@ extern void x25_kill_by_neigh(struct x25_neigh *); /* x25_dev.c */ extern void x25_send_frame(struct sk_buff *, struct x25_neigh *); -extern int x25_lapb_receive_frame(struct sk_buff *, struct net_device *, struct packet_type *); +extern int x25_lapb_receive_frame(struct sk_buff *, struct net_device *, struct packet_type *, struct net_device *); extern void x25_establish_link(struct x25_neigh *); extern void x25_terminate_link(struct x25_neigh *); |