Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6.git] / drivers / net / vmxnet3 / vmxnet3_int.h
index 8db7ecf..a9cb3fa 100644 (file)
@@ -27,6 +27,7 @@
 #ifndef _VMXNET3_INT_H
 #define _VMXNET3_INT_H
 
+#include <linux/bitops.h>
 #include <linux/ethtool.h>
 #include <linux/delay.h>
 #include <linux/netdevice.h>
@@ -315,7 +316,7 @@ struct vmxnet3_intr {
 struct vmxnet3_adapter {
        struct vmxnet3_tx_queue         tx_queue[VMXNET3_DEVICE_MAX_TX_QUEUES];
        struct vmxnet3_rx_queue         rx_queue[VMXNET3_DEVICE_MAX_RX_QUEUES];
-       struct vlan_group               *vlan_grp;
+       unsigned long                   active_vlans[BITS_TO_LONGS(VLAN_N_VID)];
        struct vmxnet3_intr             intr;
        spinlock_t                      cmd_lock;
        struct Vmxnet3_DriverShared     *shared;
@@ -323,7 +324,6 @@ struct vmxnet3_adapter {
        struct Vmxnet3_TxQueueDesc      *tqd_start;     /* all tx queue desc */
        struct Vmxnet3_RxQueueDesc      *rqd_start;     /* all rx queue desc */
        struct net_device               *netdev;
-       struct net_device_stats         net_stats;
        struct pci_dev                  *pdev;
 
        u8                      __iomem *hw_addr0; /* for BAR 0 */
@@ -407,7 +407,9 @@ vmxnet3_create_queues(struct vmxnet3_adapter *adapter,
                      u32 tx_ring_size, u32 rx_ring_size, u32 rx_ring2_size);
 
 extern void vmxnet3_set_ethtool_ops(struct net_device *netdev);
-extern struct net_device_stats *vmxnet3_get_stats(struct net_device *netdev);
+
+extern struct rtnl_link_stats64 *
+vmxnet3_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *stats);
 
 extern char vmxnet3_driver_name[];
 #endif