git.openpandora.org
/
pandora-kernel.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 master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[pandora-kernel.git]
/
include
/
linux
/
hdlc.h
diff --git
a/include/linux/hdlc.h
b/include/linux/hdlc.h
index
d4b3339
..
0fe562a
100644
(file)
--- a/
include/linux/hdlc.h
+++ b/
include/linux/hdlc.h
@@
-132,8
+132,8
@@
static __inline__ __be16 hdlc_type_trans(struct sk_buff *skb,
{
hdlc_device *hdlc = dev_to_hdlc(dev);
- skb->
mac.raw = skb->data
;
- skb
->dev = dev
;
+ skb->
dev = dev
;
+ skb
_reset_mac_header(skb)
;
if (hdlc->proto->type_trans)
return hdlc->proto->type_trans(skb, dev);