fixed merge

[netwatch.git] / net / etherboot-compat.h

diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h
index 2d8d98fb47efb3ad40588810a44988a29bb75c1a..e769ce8727232ee5dfa825ebef0c457644f32618 100644 (file)
--- a/net/etherboot-compat.h
+++ b/net/etherboot-compat.h
@@ -1,6 +1,8 @@
 #ifndef _ETHERBOOT_COMPAT_H
 #define _ETHERBOOT_COMPAT_H
 
 #ifndef _ETHERBOOT_COMPAT_H
 #define _ETHERBOOT_COMPAT_H
 

+#include <paging.h>
+

 #define ETH_ALEN       6
 
 struct dev {
 #define ETH_ALEN       6
 
 struct dev {


@@ -13,11 +15,13 @@ struct nic {
 
        unsigned int ioaddr;
        unsigned int irqno;
 
        unsigned int ioaddr;
        unsigned int irqno;

+       
+       unsigned char hwaddr[6];

 
        int (*poll) (struct nic *nic, int retrieve);
 
        int (*poll) (struct nic *nic, int retrieve);

-       void (*transmit) (const char *dest_addr, unsigned int proto, unsigned int size, const char *pkt);
+       void (*transmit) (unsigned int size, const char *pkt);

 };
 
 };
 

-#define virt_to_bus(x) ((unsigned long)x)
+#define virt_to_bus(x) memory_v2p((void *)(x))

 
 #endif
 
 #endif