iwlwifi: "tx power per chain" are part of ucode_tx_stats

[safe/jmp/linux-2.6] / drivers / net / vxge / vxge-main.h

diff --git a/drivers/net/vxge/vxge-main.h b/drivers/net/vxge/vxge-main.h
index 18d824c..7c83ba4 100644 (file)
--- a/drivers/net/vxge/vxge-main.h
+++ b/drivers/net/vxge/vxge-main.h
@@ -112,7 +112,6 @@ enum vxge_mac_addr_state {
 struct vxge_drv_config {
        int config_dev_cnt;
        int total_dev_cnt;
-       unsigned long inta_dev_open;
        int g_no_cpus;
        unsigned int vpath_per_dev;
 };
@@ -378,6 +377,7 @@ struct vxgedev {
 
 struct vxge_rx_priv {
        struct sk_buff          *skb;
+       unsigned char           *skb_data;
        dma_addr_t              data_dma;
        dma_addr_t              data_size;
 };
@@ -428,7 +428,8 @@ vxge_rx_1b_compl(struct __vxge_hw_ring *ringh, void *dtr,
 
 enum vxge_hw_status
 vxge_xmit_compl(struct __vxge_hw_fifo *fifo_hw, void *dtr,
-       enum vxge_hw_fifo_tcode t_code, void *userdata, void **skb_ptr);
+       enum vxge_hw_fifo_tcode t_code, void *userdata,
+       struct sk_buff ***skb_ptr, int nr_skbs, int *more);
 
 int vxge_close(struct net_device *dev);