Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / e1000 / e1000.h

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 62f62970f978a4bc32bdc1c987a236056c9b6b84..e9a416f4016299b4dd5a09c15001efc9ff067bcd 100644 (file)
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -182,7 +182,6 @@ struct e1000_tx_ring {
        /* array of buffer information structs */
        struct e1000_buffer *buffer_info;
 
-       spinlock_t tx_lock;
        u16 tdh;
        u16 tdt;
        bool last_tx_tso;
@@ -238,7 +237,6 @@ struct e1000_adapter {
        u16 link_speed;
        u16 link_duplex;
        spinlock_t stats_lock;
-       spinlock_t tx_queue_lock;
        unsigned int total_tx_bytes;
        unsigned int total_tx_packets;
        unsigned int total_rx_bytes;
@@ -284,7 +282,6 @@ struct e1000_adapter {
                             int cleaned_count);
        struct e1000_rx_ring *rx_ring;      /* One per active queue */
        struct napi_struct napi;
-       struct net_device *polling_netdev;  /* One per active queue */
 
        int num_tx_queues;
        int num_rx_queues;