generic swap(): iphase: rename swap() to swap_byte_order()

[pandora-kernel.git] / drivers / ieee1394 / eth1394.h

diff --git a/drivers/ieee1394/eth1394.h b/drivers/ieee1394/eth1394.h
index a3439ee..e1b5ea8 100644 (file)
--- a/drivers/ieee1394/eth1394.h
+++ b/drivers/ieee1394/eth1394.h
@@ -66,6 +66,10 @@ struct eth1394_priv {
        int bc_dgl;                     /* Outgoing broadcast datagram label */
        struct list_head ip_node_list;  /* List of IP capable nodes      */
        struct unit_directory *ud_list[ALL_NODES]; /* Cached unit dir list */
+
+       struct work_struct wake;        /* Wake up after xmit failure    */
+       struct net_device *wake_dev;    /* Stupid backlink for .wake     */
+       nodeid_t wake_node;             /* Destination of failed xmit    */
 };
 
 
@@ -78,7 +82,7 @@ struct eth1394_priv {
 
 struct eth1394hdr {
        unsigned char   h_dest[ETH1394_ALEN];   /* destination eth1394 addr     */
-       unsigned short  h_proto;                /* packet type ID field */
+       __be16          h_proto;                /* packet type ID field */
 }  __attribute__((packed));
 
 static inline struct eth1394hdr *eth1394_hdr(const struct sk_buff *skb)
@@ -95,13 +99,13 @@ typedef enum {ETH1394_GASP, ETH1394_WRREQ} eth1394_tx_type;
 struct eth1394_uf_hdr {
        u16 lf:2;
        u16 res:14;
-       u16 ether_type;         /* Ethernet packet type */
+       __be16 ether_type;              /* Ethernet packet type */
 } __attribute__((packed));
 #elif defined __LITTLE_ENDIAN_BITFIELD
 struct eth1394_uf_hdr {
        u16 res:14;
        u16 lf:2;
-       u16 ether_type;
+       __be16 ether_type;
 } __attribute__((packed));
 #else
 #error Unknown bit field type
@@ -113,7 +117,7 @@ struct eth1394_ff_hdr {
        u16 lf:2;
        u16 res1:2;
        u16 dg_size:12;         /* Datagram size */
-       u16 ether_type;         /* Ethernet packet type */
+       __be16 ether_type;              /* Ethernet packet type */
        u16 dgl;                /* Datagram label */
        u16 res2;
 } __attribute__((packed));
@@ -122,7 +126,7 @@ struct eth1394_ff_hdr {
        u16 dg_size:12;
        u16 res1:2;
        u16 lf:2;
-       u16 ether_type;
+       __be16 ether_type;
        u16 dgl;
        u16 res2;
 } __attribute__((packed));
@@ -203,11 +207,11 @@ struct eth1394_arp {
        u16 opcode;             /* ARP Opcode   */
        /* Above is exactly the same format as struct arphdr */
 
-       u64 s_uniq_id;          /* Sender's 64bit EUI                   */
+       __be64 s_uniq_id;       /* Sender's 64bit EUI           */
        u8 max_rec;             /* Sender's max packet size             */
        u8 sspd;                /* Sender's max speed                   */
-       u16 fifo_hi;            /* hi 16bits of sender's FIFO addr      */
-       u32 fifo_lo;            /* lo 32bits of sender's FIFO addr      */
+       __be16 fifo_hi;         /* hi 16bits of sender's FIFO addr      */
+       __be32 fifo_lo;         /* lo 32bits of sender's FIFO addr      */
        u32 sip;                /* Sender's IP Address                  */
        u32 tip;                /* IP Address of requested hw addr      */
 };