diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-08-30 11:33:26 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-08-30 11:33:26 -0700 |
| commit | 2016ef789a9ded2e169ad1c028ae3deb5302571f (patch) | |
| tree | 601359f15b42d4d9868b4eadfe909a7bef6435c5 /include/linux/hippidevice.h | |
| parent | 7f57356b70dda014ef269135942426e4a852023e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
| download | kernel_samsung_aries-2016ef789a9ded2e169ad1c028ae3deb5302571f.zip kernel_samsung_aries-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.gz kernel_samsung_aries-2016ef789a9ded2e169ad1c028ae3deb5302571f.tar.bz2 | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/linux/hippidevice.h')
| -rw-r--r-- | include/linux/hippidevice.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/hippidevice.h b/include/linux/hippidevice.h index 9debe6b..bab303d 100644 --- a/include/linux/hippidevice.h +++ b/include/linux/hippidevice.h @@ -26,8 +26,12 @@ #include <linux/if_hippi.h> #ifdef __KERNEL__ -extern unsigned short hippi_type_trans(struct sk_buff *skb, - struct net_device *dev); + +struct hippi_cb { + __u32 ifield; +}; + +extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev); extern struct net_device *alloc_hippi_dev(int sizeof_priv); #endif |