git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
linux
/
hdlc.h
diff --git
a/include/linux/hdlc.h
b/include/linux/hdlc.h
index
41e79a7
..
503194e
100644
(file)
--- a/
include/linux/hdlc.h
+++ b/
include/linux/hdlc.h
@@
-243,11
+243,15
@@
static __inline__ struct net_device_stats *hdlc_stats(struct net_device *dev)
static __inline__ unsigned short hdlc_type_trans(struct sk_buff *skb,
struct net_device *dev)
{
static __inline__ unsigned short hdlc_type_trans(struct sk_buff *skb,
struct net_device *dev)
{
- hdlc_device *hdlc = dev_to_hdlc(skb->dev);
+ hdlc_device *hdlc = dev_to_hdlc(dev);
+
+ skb->mac.raw = skb->data;
+ skb->dev = dev;
+
if (hdlc->proto.type_trans)
return hdlc->proto.type_trans(skb, dev);
else
if (hdlc->proto.type_trans)
return hdlc->proto.type_trans(skb, dev);
else
- return
__constant_
htons(ETH_P_HDLC);
+ return htons(ETH_P_HDLC);
}
#endif /* __KERNEL */
}
#endif /* __KERNEL */