Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 79207
b: refs/heads/master
c: a7df90a
h: refs/heads/master
i:
  79205: c2fe4c1
  79203: bd2bab7
  79199: 0423f4b
v: v3
  • Loading branch information
Al Viro authored and David S. Miller committed Jan 28, 2008
1 parent 2fba389 commit fb256fa
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8327d000e092f737f7d6602258e5c7575686cc37
refs/heads/master: a7df90a51944a963d9a4fbe12790630aa4da7aee
22 changes: 11 additions & 11 deletions trunk/drivers/net/ixgb/ixgb_hw.h
Original file line number Diff line number Diff line change
Expand Up @@ -534,12 +534,12 @@ typedef enum {
* in which case the structure must be packed in some compiler-specific
* manner. */
struct ixgb_rx_desc {
uint64_t buff_addr;
uint16_t length;
uint16_t reserved;
__le64 buff_addr;
__le16 length;
__le16 reserved;
uint8_t status;
uint8_t errors;
uint16_t special;
__le16 special;
};

#define IXGB_RX_DESC_STATUS_DD 0x01
Expand Down Expand Up @@ -567,11 +567,11 @@ struct ixgb_rx_desc {
* in which case the structure must be packed in some compiler-specific
* manner. */
struct ixgb_tx_desc {
uint64_t buff_addr;
uint32_t cmd_type_len;
__le64 buff_addr;
__le32 cmd_type_len;
uint8_t status;
uint8_t popts;
uint16_t vlan;
__le16 vlan;
};

#define IXGB_TX_DESC_LENGTH_MASK 0x000FFFFF
Expand All @@ -596,14 +596,14 @@ struct ixgb_tx_desc {
struct ixgb_context_desc {
uint8_t ipcss;
uint8_t ipcso;
uint16_t ipcse;
__le16 ipcse;
uint8_t tucss;
uint8_t tucso;
uint16_t tucse;
uint32_t cmd_type_len;
__le16 tucse;
__le32 cmd_type_len;
uint8_t status;
uint8_t hdr_len;
uint16_t mss;
__le16 mss;
};

#define IXGB_CONTEXT_DESC_CMD_TCP 0x01000000
Expand Down

0 comments on commit fb256fa

Please sign in to comment.