projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
hippidevice.h
diff --git
a/include/linux/hippidevice.h
b/include/linux/hippidevice.h
index 9bc3b688d2ee837f764b0a13aa7da83c1d6bc96e..bab303dafd6e1e4005d3d021ae7239788a3c2c63 100644
(file)
--- a/
include/linux/hippidevice.h
+++ b/
include/linux/hippidevice.h
@@
-31,8
+31,7
@@
struct hippi_cb {
__u32 ifield;
};
-extern unsigned short hippi_type_trans(struct sk_buff *skb,
- struct net_device *dev);
+extern __be16 hippi_type_trans(struct sk_buff *skb, struct net_device *dev);
extern struct net_device *alloc_hippi_dev(int sizeof_priv);
#endif