Commit 06f8c4cd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jeff Garzik

Clean up eepro100 update from David M-T:

- remove outdated comment about 2.3-only
- style up David's changelog entry like the others
- replace ifdef RX_ALIGN with a rx_align() macro
- kill pointless #if defined(MODULE) || defined(CONFIG_HOTPLUG)
  around ->remove.
parent daf69e7a
/* drivers/net/eepro100.c: An Intel i82557-559 Ethernet driver for Linux. */ /* drivers/net/eepro100.c: An Intel i82557-559 Ethernet driver for Linux. */
/* /*
NOTICE: For use with late 2.3 kernels only.
May not compile for kernels 2.3.43-47.
Written 1996-1999 by Donald Becker. Written 1996-1999 by Donald Becker.
The driver also contains updates by different kernel developers The driver also contains updates by different kernel developers
...@@ -26,7 +24,7 @@ ...@@ -26,7 +24,7 @@
2000 Jul 17 Goutham Rao <goutham.rao@intel.com> 2000 Jul 17 Goutham Rao <goutham.rao@intel.com>
PCI DMA API fixes, adding pci_dma_sync_single calls where neccesary PCI DMA API fixes, adding pci_dma_sync_single calls where neccesary
2000 Aug 31 David Mosberger <davidm@hpl.hp.com> 2000 Aug 31 David Mosberger <davidm@hpl.hp.com>
RX_ALIGN support: enables rx DMA without causing unaligned accesses. rx_align support: enables rx DMA without causing unaligned accesses.
*/ */
static const char *version = static const char *version =
...@@ -46,9 +44,10 @@ static int rxdmacount /* = 0 */; ...@@ -46,9 +44,10 @@ static int rxdmacount /* = 0 */;
#if defined(__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__mips__) || \ #if defined(__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__mips__) || \
defined(__arm__) defined(__arm__)
/* align rx buffers to 2 bytes so that IP header is aligned */ /* align rx buffers to 2 bytes so that IP header is aligned */
# define RX_ALIGN # define rx_align(skb) skb_reserve((skb), 2)
# define RxFD_ALIGNMENT __attribute__ ((aligned (2), packed)) # define RxFD_ALIGNMENT __attribute__ ((aligned (2), packed))
#else #else
# define rx_align(skb)
# define RxFD_ALIGNMENT # define RxFD_ALIGNMENT
#endif #endif
...@@ -1240,9 +1239,8 @@ speedo_init_rx_ring(struct net_device *dev) ...@@ -1240,9 +1239,8 @@ speedo_init_rx_ring(struct net_device *dev)
for (i = 0; i < RX_RING_SIZE; i++) { for (i = 0; i < RX_RING_SIZE; i++) {
struct sk_buff *skb; struct sk_buff *skb;
skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD));
#ifdef RX_ALIGN /* XXX: do we really want to call this before the NULL check? --hch */
skb_reserve(skb, 2); /* Align IP on 16 byte boundary */ rx_align(skb); /* Align IP on 16 byte boundary */
#endif
sp->rx_skbuff[i] = skb; sp->rx_skbuff[i] = skb;
if (skb == NULL) if (skb == NULL)
break; /* OK. Just initially short of Rx bufs. */ break; /* OK. Just initially short of Rx bufs. */
...@@ -1634,9 +1632,8 @@ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry) ...@@ -1634,9 +1632,8 @@ static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry)
struct sk_buff *skb; struct sk_buff *skb;
/* Get a fresh skbuff to replace the consumed one. */ /* Get a fresh skbuff to replace the consumed one. */
skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD)); skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD));
#ifdef RX_ALIGN /* XXX: do we really want to call this before the NULL check? --hch */
skb_reserve(skb, 2); /* Align IP on 16 byte boundary */ rx_align(skb); /* Align IP on 16 byte boundary */
#endif
sp->rx_skbuff[entry] = skb; sp->rx_skbuff[entry] = skb;
if (skb == NULL) { if (skb == NULL) {
sp->rx_ringp[entry] = NULL; sp->rx_ringp[entry] = NULL;
...@@ -2320,9 +2317,7 @@ static struct pci_driver eepro100_driver = { ...@@ -2320,9 +2317,7 @@ static struct pci_driver eepro100_driver = {
.name = "eepro100", .name = "eepro100",
.id_table = eepro100_pci_tbl, .id_table = eepro100_pci_tbl,
.probe = eepro100_init_one, .probe = eepro100_init_one,
# if defined(MODULE) || defined(CONFIG_HOTPLUG)
.remove = __devexit_p(eepro100_remove_one), .remove = __devexit_p(eepro100_remove_one),
# endif
#ifdef CONFIG_PM #ifdef CONFIG_PM
.suspend = eepro100_suspend, .suspend = eepro100_suspend,
.resume = eepro100_resume, .resume = eepro100_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment