igb: transition driver to only using advanced descriptors

[karo-tx-linux.git] / drivers / net / igb / e1000_hw.h

diff --git a/drivers/net/igb/e1000_hw.h b/drivers/net/igb/e1000_hw.h
index bd86cebed37cfa18e7ff4ced7328de8e2ec321f3..10b872d3c9f47149bdebe0809444a6babecdddf1 100644 (file)
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
@@ -144,144 +144,6 @@ enum e1000_fc_type {
        e1000_fc_default = 0xFF
 };
 
-
-/* Receive Descriptor */
-struct e1000_rx_desc {
-       __le64 buffer_addr; /* Address of the descriptor's data buffer */
-       __le16 length;      /* Length of data DMAed into data buffer */
-       __le16 csum;        /* Packet checksum */
-       u8  status;      /* Descriptor status */
-       u8  errors;      /* Descriptor Errors */
-       __le16 special;
-};
-
-/* Receive Descriptor - Extended */
-union e1000_rx_desc_extended {
-       struct {
-               __le64 buffer_addr;
-               __le64 reserved;
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;              /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;            /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;  /* IP id */
-                                       __le16 csum;   /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;     /* ext status/error */
-                       __le16 length;
-                       __le16 vlan;             /* VLAN tag */
-               } upper;
-       } wb;  /* writeback */
-};
-
-#define MAX_PS_BUFFERS 4
-/* Receive Descriptor - Packet Split */
-union e1000_rx_desc_packet_split {
-       struct {
-               /* one buffer for protocol header(s), three data buffers */
-               __le64 buffer_addr[MAX_PS_BUFFERS];
-       } read;
-       struct {
-               struct {
-                       __le32 mrq;              /* Multiple Rx Queues */
-                       union {
-                               __le32 rss;              /* RSS Hash */
-                               struct {
-                                       __le16 ip_id;    /* IP id */
-                                       __le16 csum;     /* Packet Checksum */
-                               } csum_ip;
-                       } hi_dword;
-               } lower;
-               struct {
-                       __le32 status_error;     /* ext status/error */
-                       __le16 length0;          /* length of buffer 0 */
-                       __le16 vlan;             /* VLAN tag */
-               } middle;
-               struct {
-                       __le16 header_status;
-                       __le16 length[3];        /* length of buffers 1-3 */
-               } upper;
-               __le64 reserved;
-       } wb; /* writeback */
-};
-
-/* Transmit Descriptor */
-struct e1000_tx_desc {
-       __le64 buffer_addr;      /* Address of the descriptor's data buffer */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 cso;        /* Checksum offset */
-                       u8 cmd;        /* Descriptor control */
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;     /* Descriptor status */
-                       u8 css;        /* Checksum start */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
-/* Offload Context Descriptor */
-struct e1000_context_desc {
-       union {
-               __le32 ip_config;
-               struct {
-                       u8 ipcss;      /* IP checksum start */
-                       u8 ipcso;      /* IP checksum offset */
-                       __le16 ipcse;     /* IP checksum end */
-               } ip_fields;
-       } lower_setup;
-       union {
-               __le32 tcp_config;
-               struct {
-                       u8 tucss;      /* TCP checksum start */
-                       u8 tucso;      /* TCP checksum offset */
-                       __le16 tucse;     /* TCP checksum end */
-               } tcp_fields;
-       } upper_setup;
-       __le32 cmd_and_length;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;     /* Descriptor status */
-                       u8 hdr_len;    /* Header length */
-                       __le16 mss;       /* Maximum segment size */
-               } fields;
-       } tcp_seg_setup;
-};
-
-/* Offload data descriptor */
-struct e1000_data_desc {
-       __le64 buffer_addr;   /* Address of the descriptor's buffer address */
-       union {
-               __le32 data;
-               struct {
-                       __le16 length;    /* Data buffer length */
-                       u8 typ_len_ext;
-                       u8 cmd;
-               } flags;
-       } lower;
-       union {
-               __le32 data;
-               struct {
-                       u8 status;     /* Descriptor status */
-                       u8 popts;      /* Packet Options */
-                       __le16 special;
-               } fields;
-       } upper;
-};
-
 /* Statistics counters collected by the MAC */
 struct e1000_hw_stats {
        u64 crcerrs;