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 master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
drivers
/
net
/
arcnet
/
rfc1201.c
diff --git
a/drivers/net/arcnet/rfc1201.c
b/drivers/net/arcnet/rfc1201.c
index
bee3422
..
460a095
100644
(file)
--- a/
drivers/net/arcnet/rfc1201.c
+++ b/
drivers/net/arcnet/rfc1201.c
@@
-96,7
+96,7
@@
static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev)
int hdr_size = ARC_HDR_SIZE + RFC1201_HDR_SIZE;
/* Pull off the arcnet header. */
- skb
->mac.raw = skb->data
;
+ skb
_reset_mac_header(skb)
;
skb_pull(skb, hdr_size);
if (pkt->hard.dest == 0)