1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h
index a1775705b24c..6e63d9a7fc75 100644
--- a/drivers/net/igb/igb.h
+++ b/drivers/net/igb/igb.h
@@ -107,6 +107,7 @@ struct vf_data_storage {
 #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
 
 /* Supported Rx Buffer Sizes */
+#define IGB_RXBUFFER_64    64     /* Used for packet split */
 #define IGB_RXBUFFER_128   128    /* Used for packet split */
 #define IGB_RXBUFFER_1024  1024
 #define IGB_RXBUFFER_2048  2048
@@ -140,8 +141,10 @@ struct igb_buffer {
                         unsigned long time_stamp;
                         u16 length;
                         u16 next_to_watch;
-                        u16 mapped_as_page;
+                        unsigned int bytecount;
                         u16 gso_segs;
+                        union skb_shared_tx shtx;
+                        u8 mapped_as_page;
                 };
                 /* RX */
                 struct {
@@ -185,7 +188,7 @@ struct igb_q_vector {
 struct igb_ring {
         struct igb_q_vector *q_vector; /* backlink to q_vector */
         struct net_device *netdev;     /* back pointer to net_device */
-        struct pci_dev *pdev;          /* pci device for dma mapping */
+        struct device *dev;            /* device pointer for dma mapping */
         dma_addr_t dma;                /* phys address of the ring */
         void *desc;                    /* descriptor ring memory */
         unsigned int size;             /* length of desc. ring in bytes */
@@ -267,7 +270,6 @@ struct igb_adapter {
 
         /* TX */
         struct igb_ring *tx_ring[16];
-        unsigned long tx_queue_len;
         u32 tx_timeout_count;
 
         /* RX */
@@ -324,6 +326,7 @@ struct igb_adapter {
 
 #define IGB_82576_TSYNC_SHIFT 19
 #define IGB_82580_TSYNC_SHIFT 24
+#define IGB_TS_HDR_LEN        16
 enum e1000_state_t {
         __IGB_TESTING,
         __IGB_RESETTING,
@@ -337,7 +340,6 @@ enum igb_boards {
 extern char igb_driver_name[];
 extern char igb_driver_version[];
 
-extern char *igb_get_hw_dev_name(struct e1000_hw *hw);
 extern int igb_up(struct igb_adapter *);
 extern void igb_down(struct igb_adapter *);
 extern void igb_reinit_locked(struct igb_adapter *);