diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 22:33:26 +0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 22:33:26 +0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /net/802/p8022.c | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
| download | linux-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.xz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'net/802/p8022.c')
| -rw-r--r-- | net/802/p8022.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/802/p8022.c b/net/802/p8022.c index 5ae63416df6d..b24817c63ca8 100644 --- a/net/802/p8022.c +++ b/net/802/p8022.c @@ -35,7 +35,8 @@ static int p8022_request(struct datalink_proto *dl, struct sk_buff *skb, struct datalink_proto *register_8022_client(unsigned char type, int (*func)(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt)) + struct packet_type *pt, + struct net_device *orig_dev)) { struct datalink_proto *proto; |