]> rtime.felk.cvut.cz Git - zynq/linux.git/commitdiff
axienet: Fix cntrl initialization
authorMichal Simek <monstr@monstr.eu>
Sun, 2 Oct 2011 10:52:59 +0000 (12:52 +0200)
committerJohn Linn <john.linn@xilinx.com>
Wed, 30 Nov 2011 04:32:51 +0000 (20:32 -0800)
Control for new BD should be only length

Signed-off-by: Michal Simek <monstr@monstr.eu>
drivers/net/xilinx_axienet_main.c

index 58dfeb44abac36873a33e77bdd7b8206d36c6a4b..d83d7dfecdb9593e535fc0eaaaf2e8e3e2aec30e 100644 (file)
@@ -294,9 +294,7 @@ static int axienet_dma_bd_init(struct net_device *ndev)
                                                skb->data,
                                                lp->max_frm_size,
                                                DMA_FROM_DEVICE);
-               lp->rx_bd_v[i].cntrl = (((lp->rx_bd_v[i].cntrl) &
-                                       ~XAXIDMA_BD_CTRL_LENGTH_MASK) |
-                                       (lp->max_frm_size));
+               lp->rx_bd_v[i].cntrl = lp->max_frm_size;
        }
 
        /* Start updating the Rx channel control register */
@@ -878,8 +876,7 @@ static void axienet_recv(struct net_device *ndev)
                cur_p->phys = dma_map_single(ndev->dev.parent, new_skb->data,
                                                lp->max_frm_size,
                                                DMA_FROM_DEVICE);
-               cur_p->cntrl = (cur_p->cntrl & ~XAXIDMA_BD_CTRL_LENGTH_MASK) |
-                                               (lp->max_frm_size);
+               cur_p->cntrl = lp->max_frm_size;
                cur_p->status = 0;
                cur_p->sw_id_offset = (u32)(new_skb);