patch-2.4.13 linux/drivers/net/acenic.h
Next file: linux/drivers/net/atari_bionet.c
Previous file: linux/drivers/net/acenic.c
Back to the patch index
Back to the overall index
- Lines: 49
- Date:
Fri Oct 12 15:35:53 2001
- Orig file:
v2.4.12/linux/drivers/net/acenic.h
- Orig date:
Thu Oct 11 08:02:26 2001
diff -u --recursive --new-file v2.4.12/linux/drivers/net/acenic.h linux/drivers/net/acenic.h
@@ -582,7 +582,6 @@
aceaddr stats2_ptr;
};
-
struct ring_info {
struct sk_buff *skb;
dma_addr_t mapping;
@@ -684,6 +683,7 @@
u32 last_tx, last_std_rx, last_mini_rx;
#endif
struct net_device_stats stats;
+ int pci_using_dac;
};
@@ -705,31 +705,11 @@
static inline void set_aceaddr(aceaddr *aa, dma_addr_t addr)
{
- unsigned long baddr = (unsigned long) addr;
-#ifdef ACE_64BIT_PTR
+ u64 baddr = (u64) addr;
aa->addrlo = baddr & 0xffffffff;
aa->addrhi = baddr >> 32;
-#else
- /* Don't bother setting zero every time */
- aa->addrlo = baddr;
-#endif
mb();
}
-
-
-#if 0
-static inline void *get_aceaddr(aceaddr *aa)
-{
- unsigned long addr;
- mb();
-#ifdef ACE_64BIT_PTR
- addr = (u64)aa->addrhi << 32 | aa->addrlo;
-#else
- addr = aa->addrlo;
-#endif
- return (void *)addr;
-}
-#endif
static inline void ace_set_txprd(struct ace_regs *regs,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)