net: convert /proc/net/rt_acct to seq_file

[safe/jmp/linux-2.6] / drivers / ieee1394 / hosts.h

diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h
index 3922f0e..49c3590 100644 (file)
--- a/drivers/ieee1394/hosts.h
+++ b/drivers/ieee1394/hosts.h
@@ -3,7 +3,6 @@
 
 #include <linux/device.h>
 #include <linux/list.h>
-#include <linux/skbuff.h>
 #include <linux/timer.h>
 #include <linux/types.h>
 #include <linux/workqueue.h>
@@ -14,6 +13,7 @@ struct module;
 
 #include "ieee1394_types.h"
 #include "csr.h"
+#include "highlevel.h"
 
 struct hpsb_packet;
 struct hpsb_iso;
@@ -25,13 +25,10 @@ struct hpsb_host {
 
        atomic_t generation;
 
-       struct sk_buff_head pending_packet_queue;
-
+       struct list_head pending_packets;
        struct timer_list timeout;
        unsigned long timeout_interval;
 
-       unsigned char iso_listen_count[64];
-
        int node_count;      /* number of identified nodes on this bus */
        int selfid_count;    /* total number of SelfIDs received */
        int nodes_active;    /* number of nodes with active link layer */
@@ -59,11 +56,11 @@ struct hpsb_host {
        struct hpsb_host_driver *driver;
        struct pci_dev *pdev;
        struct device device;
-       struct class_device class_dev;
+       struct device host_dev;
 
-       int update_config_rom;
        struct delayed_work delayed_reset;
-       unsigned int config_roms;
+       unsigned config_roms:31;
+       unsigned update_config_rom:1;
 
        struct list_head addr_space;
        u64 low_addr_space;     /* upper bound of physical DMA area */
@@ -76,6 +73,9 @@ struct hpsb_host {
        struct { DECLARE_BITMAP(map, 64); } tl_pool[ALL_NODES];
 
        struct csr_control csr;
+
+       struct hpsb_address_serve dummy_zero_addr;
+       struct hpsb_address_serve dummy_max_addr;
 };
 
 enum devctl_cmd {
@@ -101,12 +101,6 @@ enum devctl_cmd {
        /* Cancel all outstanding async requests without resetting the bus.
         * Return void. */
        CANCEL_REQUESTS,
-
-       /* Start or stop receiving isochronous channel in arg.  Return void.
-        * This acts as an optimization hint, hosts are not required not to
-        * listen on unrequested channels. */
-       ISO_LISTEN_CHANNEL,
-       ISO_UNLISTEN_CHANNEL
 };
 
 enum isoctl_cmd {
@@ -160,7 +154,7 @@ struct hpsb_host_driver {
         * to set the hardware ConfigROM if the hardware supports handling
         * reads to the ConfigROM on its own. */
        void (*set_hw_config_rom)(struct hpsb_host *host,
-                                 quadlet_t *config_rom);
+                                 __be32 *config_rom);
 
        /* This function shall implement packet transmission based on
         * packet->type.  It shall CRC both parts of the packet (unless
@@ -202,12 +196,6 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
 int hpsb_add_host(struct hpsb_host *host);
 void hpsb_resume_host(struct hpsb_host *host);
 void hpsb_remove_host(struct hpsb_host *host);
-
-/* Updates the configuration rom image of a host.  rom_version must be the
- * current version, otherwise it will fail with return value -1. If this
- * host does not support config-rom-update, it will return -EINVAL.
- * Return value 0 indicates success.
- */
 int hpsb_update_config_rom_image(struct hpsb_host *host);
 
 #endif /* _IEEE1394_HOSTS_H */