Merge tag 'blk-dim-v2' into rdma.git for-next

[linux-2.6-microblaze.git] / drivers / net / ethernet / broadcom / bnxt / bnxt.h

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index be438d8..4b3ae92 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -24,7 +24,7 @@
 #include <net/devlink.h>
 #include <net/dst_metadata.h>
 #include <net/xdp.h>
-#include <linux/net_dim.h>
+#include <linux/dim.h>
 
 struct tx_bd {
        __le32 tx_bd_len_flags_type;
@@ -810,7 +810,7 @@ struct bnxt_cp_ring_info {
        u64                     rx_bytes;
        u64                     event_ctr;
 
-       struct net_dim          dim;
+       struct dim              dim;
 
        union {
                struct tx_cmp   *cp_desc_ring[MAX_CP_PAGES];