diff --git a/[refs] b/[refs] index 8b567e0c14c0..fdab1eed837b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc4de26040d3bdc170aaa47044adf9d318a06772 +refs/heads/master: efb6c736da8f9c455c22bcbf717dbcf1889d0325 diff --git a/trunk/drivers/net/niu.c b/trunk/drivers/net/niu.c index 2cd6109b8586..2b1745328cf7 100644 --- a/trunk/drivers/net/niu.c +++ b/trunk/drivers/net/niu.c @@ -4834,6 +4834,7 @@ static int niu_compute_rbr_cfig_b(struct rx_ring_info *rp, u64 *ret) { u64 val = 0; + *ret = 0; switch (rp->rbr_block_size) { case 4 * 1024: val |= (RBR_BLKSIZE_4K << RBR_CFIG_B_BLKSIZE_SHIFT);