diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 20:33:26 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 20:33:26 +0200 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/decnet/dn_route.c | |
| parent | [CIFS] Remove cifs_sb argument from *build_path_from_dentry (diff) | |
| parent | Merge refs/heads/upstream from master.kernel.org:/pub/scm/linux/kernel/git/jg... (diff) | |
| download | linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.xz linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/decnet/dn_route.c')
| -rw-r--r-- | net/decnet/dn_route.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/decnet/dn_route.c b/net/decnet/dn_route.c index 2399fa8a3f86..2c915f305be3 100644 --- a/net/decnet/dn_route.c +++ b/net/decnet/dn_route.c @@ -572,7 +572,7 @@ static int dn_route_ptp_hello(struct sk_buff *skb) return NET_RX_SUCCESS; } -int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt) +int dn_route_rcv(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev) { struct dn_skb_cb *cb; unsigned char flags = 0; |