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 'e1000-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
daemon_kern.c
diff --git
a/arch/um/drivers/daemon_kern.c
b/arch/um/drivers/daemon_kern.c
index
9c2e7a7
..
adeece1
100644
(file)
--- a/
arch/um/drivers/daemon_kern.c
+++ b/
arch/um/drivers/daemon_kern.c
@@
-46,7
+46,7
@@
static int daemon_read(int fd, struct sk_buff **skb,
{
*skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER);
if(*skb == NULL) return(-ENOMEM);
- return(net_recvfrom(fd,
(*skb)->mac.raw,
+ return(net_recvfrom(fd,
skb_mac_header(*skb),
(*skb)->dev->mtu + ETH_HEADER_OTHER));
}