diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 14:33:26 -0400 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /include/net/datalink.h | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/net/datalink.h')
| -rw-r--r-- | include/net/datalink.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/datalink.h b/include/net/datalink.h index 5797ba3d2eb5..deb7ca75db48 100644 --- a/include/net/datalink.h +++ b/include/net/datalink.h | |||
| @@ -9,7 +9,7 @@ struct datalink_proto { | |||
| 9 | unsigned short header_length; | 9 | unsigned short header_length; |
| 10 | 10 | ||
| 11 | int (*rcvfunc)(struct sk_buff *, struct net_device *, | 11 | int (*rcvfunc)(struct sk_buff *, struct net_device *, |
| 12 | struct packet_type *); | 12 | struct packet_type *, struct net_device *); |
| 13 | int (*request)(struct datalink_proto *, struct sk_buff *, | 13 | int (*request)(struct datalink_proto *, struct sk_buff *, |
| 14 | unsigned char *); | 14 | unsigned char *); |
| 15 | struct list_head node; | 15 | struct list_head node; |