projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
TPM: fix suspend and resume failure
[linux-2.6-block.git]
/
net
/
ax25
/
ax25_in.c
diff --git
a/net/ax25/ax25_in.c
b/net/ax25/ax25_in.c
index 3b7d1720c2eee2c3d652526f74f92094bb4634b4..d1be080dcb25c242d9af620470f20bd3cf8de307 100644
(file)
--- a/
net/ax25/ax25_in.c
+++ b/
net/ax25/ax25_in.c
@@
-124,7
+124,7
@@
int ax25_rx_iframe(ax25_cb *ax25, struct sk_buff *skb)
}
skb_pull(skb, 1); /* Remove PID */
- skb
_reset_mac_header(skb)
;
+ skb
->mac_header = skb->network_header
;
skb_reset_network_header(skb);
skb->dev = ax25->ax25_dev->dev;
skb->pkt_type = PACKET_HOST;