From 7e450a1c869a5b227e3c91c4e71049059f1193e6 Mon Sep 17 00:00:00 2001 From: kaloz Date: Sat, 3 Mar 2007 23:12:34 +0000 Subject: upgrade the ixp4xx ethernet driver to v0.3.1, split the Gateway 7001 support to two patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6489 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/101-npe_driver_fix_qmgr.patch | 36 ---------------------- 1 file changed, 36 deletions(-) delete mode 100644 target/linux/ixp4xx-2.6/patches/101-npe_driver_fix_qmgr.patch (limited to 'target/linux/ixp4xx-2.6/patches/101-npe_driver_fix_qmgr.patch') diff --git a/target/linux/ixp4xx-2.6/patches/101-npe_driver_fix_qmgr.patch b/target/linux/ixp4xx-2.6/patches/101-npe_driver_fix_qmgr.patch deleted file mode 100644 index 7e2a4a12d..000000000 --- a/target/linux/ixp4xx-2.6/patches/101-npe_driver_fix_qmgr.patch +++ /dev/null @@ -1,36 +0,0 @@ - ---- - drivers/net/ixp4xx/ixp4xx_qmgr.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - ---- linux-ixp4xx.orig/drivers/net/ixp4xx/ixp4xx_qmgr.c 2006-10-15 18:52:35.000000000 +0200 -+++ linux-ixp4xx/drivers/net/ixp4xx/ixp4xx_qmgr.c 2006-10-15 18:54:32.000000000 +0200 -@@ -107,7 +107,7 @@ static int get_free_qspace(struct qm_qmg - return -1; - } - --static inline int log2(int x) -+static inline int _log2(int x) - { - int r=0; - while(x>>=1) -@@ -127,7 +127,7 @@ static inline int log2(int x) - */ - static int conf_q_regs(struct qm_queue *queue) - { -- int bsize = log2(queue->len/16); -+ int bsize = _log2(queue->len/16); - int baddr = queue->addr + IX_QMGR_QCFG_SIZE; - - /* +2, because baddr is in words and not in bytes */ -@@ -141,8 +141,8 @@ void queue_set_watermarks(struct qm_queu - u32 val; - /* calculate the register values - * 0->0, 1->1, 2->2, 4->3, 8->4 16->5...*/ -- ne = log2(ne<<1) & 0x7; -- nf = log2(nf<<1) & 0x7; -+ ne = _log2(ne<<1) & 0x7; -+ nf = _log2(nf<<1) & 0x7; - - /* Mask out old watermarks */ - val = queue_read_cfg_reg(queue) & ~0xfc000000; -- cgit v1.2.3