Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 150709
b: refs/heads/master
c: da4dd0f
h: refs/heads/master
i:
  150707: 41a745a
v: v3
  • Loading branch information
Peter P Waskiewicz Jr authored and David S. Miller committed Jun 7, 2009
1 parent 941c72c commit ccabfce
Show file tree
Hide file tree
Showing 4 changed files with 843 additions and 4 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: 1479ad4fbfbc801898dce1ac2d4d44f0c774ecc5
refs/heads/master: da4dd0f7ca3fa667b7bba5fd34adceaf3fb84a9b
8 changes: 8 additions & 0 deletions trunk/drivers/net/ixgbe/ixgbe.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ struct ixgbe_q_vector {
#define IXGBE_TX_CTXTDESC_ADV(R, i) \
(&(((struct ixgbe_adv_tx_context_desc *)((R).desc))[i]))

#define IXGBE_GET_DESC(R, i, type) (&(((struct type *)((R).desc))[i]))
#define IXGBE_TX_DESC(R, i) IXGBE_GET_DESC(R, i, ixgbe_legacy_tx_desc)
#define IXGBE_RX_DESC(R, i) IXGBE_GET_DESC(R, i, ixgbe_legacy_rx_desc)

#define IXGBE_MAX_JUMBO_FRAME_SIZE 16128
#ifdef IXGBE_FCOE
/* Use 3K as the baby jumbo frame size for FCoE */
Expand Down Expand Up @@ -327,6 +331,10 @@ struct ixgbe_adapter {
struct pci_dev *pdev;
struct net_device_stats net_stats;

u32 test_icr;
struct ixgbe_ring test_tx_ring;
struct ixgbe_ring test_rx_ring;

/* structs defined in ixgbe_hw.h */
struct ixgbe_hw hw;
u16 msg_enable;
Expand Down
Loading

0 comments on commit ccabfce

Please sign in to comment.