Merge branch 'simplify_PRT' into release

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

diff --git a/drivers/net/mlx4/mlx4_en.h b/drivers/net/mlx4/mlx4_en.h
index 24f6d2585a6e199a8f87ed6fc7a096918bca68c6..e9af32d41ca44aee1fa0024aa261a76ab3133b07 100644 (file)
--- a/drivers/net/mlx4/mlx4_en.h
+++ b/drivers/net/mlx4/mlx4_en.h
@@ -115,6 +115,10 @@ enum {
 };
 #define MLX4_EN_MAX_RX_FRAGS   4
 
+/* Maximum ring sizes */
+#define MLX4_EN_MAX_TX_SIZE    8192
+#define MLX4_EN_MAX_RX_SIZE    8192
+
 /* Minimum ring size for our page-allocation sceme to work */
 #define MLX4_EN_MIN_RX_SIZE    (MLX4_EN_ALLOC_SIZE / SMP_CACHE_BYTES)
 #define MLX4_EN_MIN_TX_SIZE    (4096 / TXBB_SIZE)
@@ -202,6 +206,7 @@ struct mlx4_en_tx_info {
        u32 nr_txbb;
        u8 linear;
        u8 data_offset;
+       u8 inl;
 };
 
 
@@ -311,7 +316,6 @@ struct mlx4_en_cq {
        enum cq_type is_tx;
        u16 moder_time;
        u16 moder_cnt;
-       int armed;
        struct mlx4_cqe *buf;
 #define MLX4_EN_OPCODE_ERROR   0x1e
 };
@@ -334,9 +338,6 @@ struct mlx4_en_profile {
        u8 rss_mask;
        u32 active_ports;
        u32 small_pkt_int;
-       int rx_moder_cnt;
-       int rx_moder_time;
-       int auto_moder;
        u8 no_reset;
        struct mlx4_en_port_profile prof[MLX4_MAX_PORTS + 1];
 };
@@ -493,6 +494,12 @@ void mlx4_en_destroy_netdev(struct net_device *dev);
 int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port,
                        struct mlx4_en_port_profile *prof);
 
+int mlx4_en_start_port(struct net_device *dev);
+void mlx4_en_stop_port(struct net_device *dev);
+
+void mlx4_en_free_resources(struct mlx4_en_priv *priv);
+int mlx4_en_alloc_resources(struct mlx4_en_priv *priv);
+
 int mlx4_en_get_profile(struct mlx4_en_dev *mdev);
 
 int mlx4_en_create_cq(struct mlx4_en_priv *priv, struct mlx4_en_cq *cq,