summaryrefslogtreecommitdiffstats
path: root/include/net/datalink.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-30 13:32:29 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-08-30 13:32:29 -0400
commited735ccbefaf7e5e3ef61418f7e209b8c59308a7 (patch)
treeb8cc69814d2368b08d0a84c8da0c12028bd04867 /include/net/datalink.h
parent39fbe47377062200acc26ea0ccef223b4399a82c (diff)
parentd8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff)
downloadkernel-crypto-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.tar.gz
kernel-crypto-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.tar.xz
kernel-crypto-ed735ccbefaf7e5e3ef61418f7e209b8c59308a7.zip
Merge HEAD from /spare/repo/linux-2.6/.git
Diffstat (limited to 'include/net/datalink.h')
-rw-r--r--include/net/datalink.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/datalink.h b/include/net/datalink.h
index 5797ba3d2eb..deb7ca75db4 100644
--- a/include/net/datalink.h
+++ b/include/net/datalink.h
@@ -9,7 +9,7 @@ struct datalink_proto {
unsigned short header_length;
int (*rcvfunc)(struct sk_buff *, struct net_device *,
- struct packet_type *);
+ struct packet_type *, struct net_device *);
int (*request)(struct datalink_proto *, struct sk_buff *,
unsigned char *);
struct list_head node;