bitkeeper revision 1.781 (40503a57o9IN1Zi1y3KsOzZPT7-6kg)

Merge scramble.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xeno.bk

xen/drivers/net/8139too.c

@@ -128,7 +128,7 @@ typedef int pid_t;
 
 
 /* enable PIO instead of MMIO, if CONFIG_8139TOO_PIO is selected */
-#ifdef CONFIG_8139TOO_PIO
+#if defined(CONFIG_8139TOO_PIO) || defined(XEN) /* XXX MMIO fails on Xen :-( */
 #define USE_IO_OPS 1
 #endif
 
@@ -2250,6 +2250,7 @@ static int rtl8139_close (struct net_device *dev)
 	return 0;
 }
 
+#ifndef XEN
 
 /* Get the ethtool Wake-on-LAN settings.  Assumes that wol points to
    kernel memory, *wol has been initialized as {ETHTOOL_GWOL}, and
@@ -2325,7 +2326,6 @@ static int netdev_set_wol (struct net_device *dev,
 	return 0;
 }
 
-#ifndef XEN
 static int netdev_ethtool_ioctl (struct net_device *dev, void *useraddr)
 {
 	struct rtl8139_private *np = dev->priv;

xen/include/xeno/etherdevice.h

@@ -25,6 +25,7 @@
 #define _LINUX_ETHERDEVICE_H
 
 #include <xeno/if_ether.h>
+#include <asm/domain_page.h>
 
 #ifdef __KERNEL__
 extern int		eth_header(struct sk_buff *skb, struct net_device *dev,
@@ -43,7 +44,9 @@ extern struct net_device *alloc_etherdev(int sizeof_priv);
 
 static inline void eth_copy_and_sum (struct sk_buff *dest, unsigned char *src, int len, int base)
 {
-	memcpy (dest->data, src, len);
+	char *vdata = map_domain_mem(__pa(dest->data));
+	memcpy(vdata, src, len);
+	unmap_domain_mem(vdata);
 }
 
 /**