patch-2.4.12 linux/drivers/net/acenic.h

Next file: linux/drivers/net/aironet4500.h
Previous file: linux/drivers/net/acenic.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.11/linux/drivers/net/acenic.h linux/drivers/net/acenic.h
@@ -582,28 +582,21 @@
 	aceaddr	stats2_ptr;
 };
 
-#if defined(CONFIG_X86) || defined(CONFIG_PPC)
-/* Intel has null pci_unmap_single, no reasons to remember mapping. */
-#define DUMMY_PCI_UNMAP
-#endif
 
 struct ring_info {
 	struct sk_buff		*skb;
-#ifndef DUMMY_PCI_UNMAP
 	dma_addr_t		mapping;
-#endif
 };
 
-/* Funny... As soon as we add maplen on alpha, it starts to work
+/*
+ * Funny... As soon as we add maplen on alpha, it starts to work
  * much slower. Hmm... is it because struct does not fit to one cacheline?
  * So, split tx_ring_info.
  */
 struct tx_ring_info {
 	struct sk_buff		*skb;
-#ifndef DUMMY_PCI_UNMAP
 	dma_addr_t		mapping;
 	int			maplen;
-#endif
 };
 
 /*

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)