vxge: NETIF_F_LLTX removal

[mv-sheeva.git] / drivers / net / vxge / vxge-main.h

diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index a3845822d46ea3858be042c8a2be60ab32386ea9..5982396787fcc43759d126fde75da85196a85d29 100644 (file)
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -217,17 +217,13 @@ struct vxge_fifo_stats {
 };
 
 struct vxge_fifo {
-       struct net_device       *ndev;
-       struct pci_dev          *pdev;
+       struct net_device *ndev;
+       struct pci_dev *pdev;
        struct __vxge_hw_fifo *handle;
+       struct netdev_queue *txq;
 
-       /* The vpath id maintained in the driver -
-        * 0 to 'maximum_vpaths_in_function - 1'
-        */
-       int driver_id;
        int tx_steering_type;
        int indicate_max_pkts;
-       spinlock_t tx_lock;
 
        /* Tx stats */
        struct vxge_fifo_stats stats;
@@ -275,7 +271,6 @@ struct vxge_ring {
 } ____cacheline_aligned;
 
 struct vxge_vpath {
-
        struct vxge_fifo fifo;
        struct vxge_ring ring;
 
@@ -443,10 +438,6 @@ int vxge_open_vpaths(struct vxgedev *vdev);
 
 enum vxge_hw_status vxge_reset_all_vpaths(struct vxgedev *vdev);
 
-void vxge_stop_tx_queue(struct vxge_fifo *fifo);
-
-void vxge_wake_tx_queue(struct vxge_fifo *fifo);
-
 enum vxge_hw_status vxge_add_mac_addr(struct vxgedev *vdev,
        struct macInfo *mac);