git.samba.org
/
sfrench
/
cifs-2.6.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/jikos/hid
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
arcnet
/
rfc1051.c
diff --git
a/drivers/net/arcnet/rfc1051.c
b/drivers/net/arcnet/rfc1051.c
index 6d6c69f036ef8b1d6df8f378f20683a7fa2a172d..2de8877ece292df4e84c85e2c6ba01c58366a74b 100644
(file)
--- a/
drivers/net/arcnet/rfc1051.c
+++ b/
drivers/net/arcnet/rfc1051.c
@@
-94,7
+94,7
@@
static unsigned short type_trans(struct sk_buff *skb, struct net_device *dev)
int hdr_size = ARC_HDR_SIZE + RFC1051_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)