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

[linux-2.6-microblaze.git] / drivers / net / ethernet / broadcom / genet / bcmgenet.c

diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
index 41b50e6..34466b8 100644 (file)
--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c
+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -640,7 +640,7 @@ static void bcmgenet_set_rx_coalesce(struct bcmgenet_rx_ring *ring,
 static void bcmgenet_set_ring_rx_coalesce(struct bcmgenet_rx_ring *ring,
                                          struct ethtool_coalesce *ec)
 {
-       struct net_dim_cq_moder moder;
+       struct dim_cq_moder moder;
        u32 usecs, pkts;
 
        ring->rx_coalesce_usecs = ec->rx_coalesce_usecs;
@@ -1895,7 +1895,7 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget)
 {
        struct bcmgenet_rx_ring *ring = container_of(napi,
                        struct bcmgenet_rx_ring, napi);
-       struct net_dim_sample dim_sample;
+       struct dim_sample dim_sample;
        unsigned int work_done;
 
        work_done = bcmgenet_desc_rx(ring, budget);
@@ -1906,8 +1906,8 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget)
        }
 
        if (ring->dim.use_dim) {
-               net_dim_sample(ring->dim.event_ctr, ring->dim.packets,
-                              ring->dim.bytes, &dim_sample);
+               dim_update_sample(ring->dim.event_ctr, ring->dim.packets,
+                                 ring->dim.bytes, &dim_sample);
                net_dim(&ring->dim.dim, dim_sample);
        }
 
@@ -1916,16 +1916,16 @@ static int bcmgenet_rx_poll(struct napi_struct *napi, int budget)
 
 static void bcmgenet_dim_work(struct work_struct *work)
 {
-       struct net_dim *dim = container_of(work, struct net_dim, work);
+       struct dim *dim = container_of(work, struct dim, work);
        struct bcmgenet_net_dim *ndim =
                        container_of(dim, struct bcmgenet_net_dim, dim);
        struct bcmgenet_rx_ring *ring =
                        container_of(ndim, struct bcmgenet_rx_ring, dim);
-       struct net_dim_cq_moder cur_profile =
+       struct dim_cq_moder cur_profile =
                        net_dim_get_rx_moderation(dim->mode, dim->profile_ix);
 
        bcmgenet_set_rx_coalesce(ring, cur_profile.usec, cur_profile.pkts);
-       dim->state = NET_DIM_START_MEASURE;
+       dim->state = DIM_START_MEASURE;
 }
 
 /* Assign skb to RX DMA descriptor. */
@@ -2082,7 +2082,7 @@ static void bcmgenet_init_dim(struct bcmgenet_rx_ring *ring,
        struct bcmgenet_net_dim *dim = &ring->dim;
 
        INIT_WORK(&dim->dim.work, cb);
-       dim->dim.mode = NET_DIM_CQ_PERIOD_MODE_START_FROM_EQE;
+       dim->dim.mode = DIM_CQ_PERIOD_MODE_START_FROM_EQE;
        dim->event_ctr = 0;
        dim->packets = 0;
        dim->bytes = 0;
@@ -2091,7 +2091,7 @@ static void bcmgenet_init_dim(struct bcmgenet_rx_ring *ring,
 static void bcmgenet_init_rx_coalesce(struct bcmgenet_rx_ring *ring)
 {
        struct bcmgenet_net_dim *dim = &ring->dim;
-       struct net_dim_cq_moder moder;
+       struct dim_cq_moder moder;
        u32 usecs, pkts;
 
        usecs = ring->rx_coalesce_usecs;