Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
  sk98lin: planned removal
  AT91: MACB support
  sky2: version 1.12
  sky2: add new chip ids
  sky2: Yukon Extreme support
  sky2: safer transmit timeout
  sky2: TSO support for EC_U
  sky2: use dev_err for error reports
  sky2: add Wake On Lan support
  fix unaligned exception in /drivers/net/wireless/orinoco.c
  Remove unused kernel config option DLCI_COUNT
  z85230: spinlock logic
  mips: declance: Driver model for the PMAD-A
  Spidernet: Rework RX linked list
  NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
  NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
  hp100: convert pci_module_init() to pci_register_driver()
  NetXen: Added ethtool support for user level tools.
  NetXen: Firmware crb init changes.
  maintainers: add atl1 maintainers
  ...

1 files changed, 6 insertions, 14 deletions

diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h
index 3e196df29790..2fec5cf76926 100644
--- a/drivers/net/spider_net.h
+++ b/drivers/net/spider_net.h
@@ -24,7 +24,7 @@
 #ifndef _SPIDER_NET_H
 #define _SPIDER_NET_H
 
-#define VERSION "1.6 A"
+#define VERSION "1.6 B"
 
 #include "sungem_phy.h"
 
@@ -378,6 +378,9 @@ struct spider_net_descr_chain {
         spinlock_t lock;
         struct spider_net_descr *head;
         struct spider_net_descr *tail;
+        struct spider_net_descr *ring;
+        int num_desc;
+        dma_addr_t dma_addr;
 };
 
 /* descriptor data_status bits */
@@ -397,8 +400,6 @@ struct spider_net_descr_chain {
  * 701b8000 would be correct, but every packets gets that flag */
 #define SPIDER_NET_DESTROY_RX_FLAGS     0x700b8000
 
-#define SPIDER_NET_DESCR_SIZE           32
-
 /* this will be bigger some time */
 struct spider_net_options {
         int rx_csum; /* for rx: if 0 ip_summed=NONE,
@@ -441,25 +442,16 @@ struct spider_net_card {
         struct spider_net_descr_chain rx_chain;
         struct spider_net_descr *low_watermark;
 
-        struct net_device_stats netdev_stats;
-
-        struct spider_net_options options;
-
-        spinlock_t intmask_lock;
-        struct tasklet_struct rxram_full_tl;
         struct timer_list tx_timer;
-
         struct work_struct tx_timeout_task;
         atomic_t tx_timeout_task_counter;
         wait_queue_head_t waitq;
 
         /* for ethtool */
         int msg_enable;
-        int num_rx_desc;
-        int num_tx_desc;
+        struct net_device_stats netdev_stats;
         struct spider_net_extra_stats spider_stats;
-
-        struct spider_net_descr descr[0];
+        struct spider_net_options options;
 };
 
 #define pr_err(fmt,arg...) \