target/linux/ixp4xx-2.6/patches/101-npe_driver_fix_qmgr.patch

   1
   2 ---
   3  drivers/net/ixp4xx/ixp4xx_qmgr.c |    8 ++++----
   4  1 file changed, 4 insertions(+), 4 deletions(-)
   5
   6 --- linux-ixp4xx.orig/drivers/net/ixp4xx/ixp4xx_qmgr.c  2006-10-15 18:52:35.000000000 +0200
   7 +++ linux-ixp4xx/drivers/net/ixp4xx/ixp4xx_qmgr.c       2006-10-15 18:54:32.000000000 +0200
   8 @@ -107,7 +107,7 @@ static int get_free_qspace(struct qm_qmg
   9         return -1;
  10  }
  11
  12 -static inline int log2(int x)
  13 +static inline int _log2(int x)
  14  {
  15         int r=0;
  16         while(x>>=1)
  17 @@ -127,7 +127,7 @@ static inline int log2(int x)
  18   */
  19  static int conf_q_regs(struct qm_queue *queue)
  20  {
  21 -       int bsize = log2(queue->len/16);
  22 +       int bsize = _log2(queue->len/16);
  23         int baddr = queue->addr + IX_QMGR_QCFG_SIZE;
  24
  25         /* +2, because baddr is in words and not in bytes */
  26 @@ -141,8 +141,8 @@ void queue_set_watermarks(struct qm_queu
  27         u32 val;
  28         /* calculate the register values
  29          * 0->0, 1->1, 2->2, 4->3, 8->4 16->5...*/
  30 -       ne = log2(ne<<1) & 0x7;
  31 -       nf = log2(nf<<1) & 0x7;
  32 +       ne = _log2(ne<<1) & 0x7;
  33 +       nf = _log2(nf<<1) & 0x7;
  34
  35         /* Mask out old watermarks */
  36         val = queue_read_cfg_reg(queue) & ~0xfc000000;