aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/drivers/daemon_kern.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/drivers/daemon_kern.c')
-rw-r--r--arch/um/drivers/daemon_kern.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/um/drivers/daemon_kern.c b/arch/um/drivers/daemon_kern.c
index ac507bb87fea..d53ff52bb404 100644
--- a/arch/um/drivers/daemon_kern.c
+++ b/arch/um/drivers/daemon_kern.c
@@ -39,20 +39,15 @@ static void daemon_init(struct net_device *dev, void *data)
39 printk("\n"); 39 printk("\n");
40} 40}
41 41
42static int daemon_read(int fd, struct sk_buff **skb, 42static int daemon_read(int fd, struct sk_buff *skb, struct uml_net_private *lp)
43 struct uml_net_private *lp)
44{ 43{
45 *skb = ether_adjust_skb(*skb, ETH_HEADER_OTHER); 44 return net_recvfrom(fd, skb_mac_header(skb),
46 if (*skb == NULL) 45 skb->dev->mtu + ETH_HEADER_OTHER);
47 return -ENOMEM;
48 return net_recvfrom(fd, skb_mac_header(*skb),
49 (*skb)->dev->mtu + ETH_HEADER_OTHER);
50} 46}
51 47
52static int daemon_write(int fd, struct sk_buff **skb, 48static int daemon_write(int fd, struct sk_buff *skb, struct uml_net_private *lp)
53 struct uml_net_private *lp)
54{ 49{
55 return daemon_user_write(fd, (*skb)->data, (*skb)->len, 50 return daemon_user_write(fd, skb->data, skb->len,
56 (struct daemon_data *) &lp->user); 51 (struct daemon_data *) &lp->user);
57} 52}
58 53