diff options
| author | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
|---|---|---|
| committer | Denys Dmytriyenko <denis@denix.org> | 2009-03-17 14:32:59 -0400 |
| commit | 709c4d66e0b107ca606941b988bad717c0b45d9b (patch) | |
| tree | 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/ixp425-eth | |
| parent | fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff) | |
rename packages/ to recipes/ per earlier agreement
See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816
Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'packages/ixp425-eth')
54 files changed, 0 insertions, 4765 deletions
diff --git a/packages/ixp425-eth/files/2.6.13.patch b/packages/ixp425-eth/files/2.6.13.patch deleted file mode 100644 index 7e8bea1b5d..0000000000 --- a/packages/ixp425-eth/files/2.6.13.patch +++ /dev/null @@ -1,41 +0,0 @@ -# Patches for compilation with 2.6.13.2 -# ---- dir/ixp425_eth.c 2005-09-23 18:34:54.753729121 -0700 -+++ dir/ixp425_eth.c 2005-09-23 18:37:48.908688002 -0700 -@@ -659,7 +659,9 @@ - skb->pkt_type = PACKET_HOST; /* Default type */ - skb->ip_summed = 0; - skb->priority = 0; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - skb->security = 0; -+#endif - - /* Some packets may get incorrectly process by netfilter firewall software - * if CONFIG_NETFILTER is enabled and filtering is in use. The solution is to -@@ -2358,8 +2362,14 @@ - } - - /* set port MAC addr and update the dev struct if successfull */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - int dev_set_mac_address(struct net_device *dev, struct sockaddr *saddr) - { -+#else -+static int set_mac_address(struct net_device *dev, void *saddrIn) -+{ -+ struct sockaddr *saddr = saddrIn; -+#endif - int res; - priv_data_t *priv = dev->priv; - IxEthAccMacAddr npeMacAddr; -@@ -2476,7 +2486,11 @@ - ndev->poll_controller = ixp425eth_poll_controller; - #endif - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - ndev->set_mac_address = dev_set_mac_address; -+#else -+ ndev->set_mac_address = set_mac_address; -+#endif - - memcpy(ndev->dev_addr, &default_mac_addr[priv->port_id].macAddress, - IX_IEEE803_MAC_ADDRESS_SIZE); diff --git a/packages/ixp425-eth/files/2.6.14.patch b/packages/ixp425-eth/files/2.6.14.patch deleted file mode 100644 index e93edb6e9b..0000000000 --- a/packages/ixp425-eth/files/2.6.14.patch +++ /dev/null @@ -1,28 +0,0 @@ -# change in field semantic in 2.6.14 ---- dir/ixp425_eth.c 2005-09-24 17:50:57.828607113 -0700 -+++ dir/ixp425_eth.c 2005-09-24 17:54:19.593303365 -0700 -@@ -668,7 +668,11 @@ - * reset the following fields in the skbuff before re-using it on the Rx-path - */ - #ifdef CONFIG_NETFILTER -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) - skb->nfmark = skb->nfcache = 0; -+#else -+ skb->nfmark = 0; -+#endif - nf_conntrack_put(skb->nfct); - skb->nfct = NULL; - #ifdef CONFIG_NETFILTER_DEBUG -@@ -1300,8 +1300,12 @@ - skb->len -= header_len; - - /* fill the pkt arrival time (set at the irq callback entry) */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) - skb->stamp.tv_sec = irq_stamp.tv_sec; - skb->stamp.tv_usec = irq_stamp.tv_usec; -+#else -+ skb_set_timestamp(skb, &irq_stamp); -+#endif - - /* fill the input device field */ - skb->dev = dev; diff --git a/packages/ixp425-eth/files/ethhdr.patch b/packages/ixp425-eth/files/ethhdr.patch deleted file mode 100644 index 79c9fef34f..0000000000 --- a/packages/ixp425-eth/files/ethhdr.patch +++ /dev/null @@ -1,25 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- ixp425-eth-1.1-r0/ixp425_eth.c~ethhdr -+++ ixp425-eth-1.1-r0/ixp425_eth.c -@@ -1307,7 +1307,7 @@ - * and its constants are taken from the eth_type_trans() - * function. - */ -- struct ethhdr *eth = skb->mac.ethernet; -+ struct ethhdr *eth = eth_hdr(skb); - unsigned short hproto = ntohs(eth->h_proto); - - if (hproto >= 1536) -@@ -1349,7 +1349,7 @@ - * mode is set This costs - * a lookup inside the packet payload. - */ -- struct ethhdr *eth = skb->mac.ethernet; -+ struct ethhdr *eth = eth_hdr(skb); - unsigned char *hdest = eth->h_dest; - - if (memcmp(hdest, dev->dev_addr, ETH_ALEN)!=0) diff --git a/packages/ixp425-eth/files/intdriven.patch b/packages/ixp425-eth/files/intdriven.patch deleted file mode 100644 index 88b2444b5e..0000000000 --- a/packages/ixp425-eth/files/intdriven.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- ixp425-eth-1.1-r4/ixp425_eth.c 2005-06-16 00:47:55.360598896 -0700 -+++ ixp425-eth-1.1-r4/ixp425_eth.c 2005-06-16 18:42:09.840377651 -0700 -@@ -1028,6 +1030,7 @@ - */ - - /* PMU Timer reload : this should be done at each interrupt */ -+#if 0 /* UNUSED - used for polling */ - static void dev_pmu_timer_restart(void) - { - __asm__(" mcr p14,0,%0,c1,c1,0\n" /* write current counter */ -@@ -1039,6 +1042,7 @@ - " mcr p14,0,r1,c4,c1,0\n" /* enable interrupts */ - : : : "r1"); - } -+#endif - - /* Internal ISR : run a few thousand times per second and calls - * the queue manager dispatcher entry point. -@@ -1086,6 +1088,7 @@ - /* Internal ISR : run a few thousand times per second and calls - * the ethernet entry point. - */ -+#if 0 /* UNUSED - used for polling */ - static irqreturn_t dev_poll_os_isr(int irg, void *dev_id, struct pt_regs *regs) - { - int qlevel = __get_cpu_var(softnet_data).input_pkt_queue.qlen; -@@ -1127,8 +1130,10 @@ - ixEthTxFrameDoneQMCallback(0,0); - return IRQ_HANDLED; - } -+#endif - - /* initialize the PMU timer */ -+#if 0 /* UNUSED - used for polling */ - static int dev_pmu_timer_init(void) - { - UINT32 controlRegisterMask = -@@ -1164,6 +1169,7 @@ - - return 0; - } -+#endif - - /* stops the timer when the module terminates */ - static void dev_pmu_timer_disable(void) -@@ -1636,6 +1636,7 @@ - return 0; - } - -+#if 0 /* UNUSED - used for polling */ - /* The QMgr dispatch entry point can be called from the - * IXP425_INT_LVL_QM1 irq (which will trigger - * an interrupt for every packet) or a timer (which will -@@ -1686,7 +1687,7 @@ - */ - if (request_irq(IXP425_INT_LVL_QM1, - dev_qmgr_os_isr, -- SA_SHIRQ, -+ SA_SHIRQ | SA_SAMPLE_RANDOM, - DRV_NAME, - (void *)IRQ_ANY_PARAMETER)) - { -@@ -1710,6 +1711,7 @@ - } - return 0; - } -+#endif - - /* Enable the MAC port. - * Called on do_dev_open, dev_tx_timeout and mtu size changes -@@ -2234,7 +2236,7 @@ - */ - if (request_irq(IXP425_INT_LVL_QM1, - dev_qmgr_os_isr, -- SA_SHIRQ, -+ SA_SHIRQ | SA_SAMPLE_RANDOM, - DRV_NAME, - (void *)IRQ_ANY_PARAMETER)) - { -@@ -2669,6 +2671,10 @@ - - TRACE; - -+#if 0 /* DISABLE polling */ -+ /* Enable Interrupt driven driver -+ * see http://www.nslu2-linux.org/wiki/OpenSlug/StabilizeEthernetDriver -+ */ - if (no_csr_init == 0) /* module parameter */ - { - /* The QMgr dispatch entry point is called from the IXP425_INT_LVL_QM1 irq -@@ -2681,6 +2687,7 @@ - return res; - } - } -+#endif - - TRACE; - diff --git a/packages/ixp425-eth/files/ixp400_pollcontroller.patch b/packages/ixp425-eth/files/ixp400_pollcontroller.patch deleted file mode 100644 index b6fe10a5c6..0000000000 --- a/packages/ixp425-eth/files/ixp400_pollcontroller.patch +++ /dev/null @@ -1,50 +0,0 @@ -*** ixp400-eth-1.4-r4/ixp400_eth.c.orig Mon Oct 31 22:45:46 2005 ---- ixp400-eth-1.4-r4/ixp400_eth.c Mon Oct 31 22:47:48 2005 -*************** -*** 306,311 **** ---- 306,316 ---- - ixEthRxFrameQMCallback(IxQMgrQId qId, IxQMgrCallbackId callbackId); - extern void - ixEthTxFrameDoneQMCallback(IxQMgrQId qId, IxQMgrCallbackId callbackId); -+ #ifdef CONFIG_NET_POLL_CONTROLLER -+ /* poll controller (needed for netconsole et al) */ -+ static void -+ ixp425eth_poll_controller(struct net_device *dev); -+ #endif - - /* Private device data */ - typedef struct { -*************** -*** 3082,3087 **** ---- 3087,3095 ---- - ndev->get_stats = dev_get_stats; - ndev->set_multicast_list = dev_set_multicast_list; - ndev->flags |= IFF_MULTICAST; -+ #ifdef CONFIG_NET_POLL_CONTROLLER -+ ndev->poll_controller = ixp425eth_poll_controller; -+ #endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - ndev->set_mac_address = dev_set_mac_address; - #else -*************** -*** 3172,3177 **** ---- 3180,3198 ---- - return res; - } - -+ #ifdef CONFIG_NET_POLL_CONTROLLER -+ /* -+ * Polling receive - used by netconsole and other diagnostic tools -+ * to allow network i/o with interrupts disabled. -+ * (stolen from 8139too.c by siddy) -+ */ -+ static void ixp425eth_poll_controller(struct net_device *dev) -+ { -+ disable_irq(dev->irq); -+ dev_qmgr_os_isr(dev->irq, dev, NULL); -+ enable_irq(dev->irq); -+ } -+ #endif - - static int __devinit npe_eth_init_device(struct device *dev) - { diff --git a/packages/ixp425-eth/files/makefile.patch b/packages/ixp425-eth/files/makefile.patch deleted file mode 100644 index 2e47972995..0000000000 --- a/packages/ixp425-eth/files/makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- /dev/null -+++ ixp425-eth-1.1-r0/Makefile -@@ -0,0 +1,10 @@ -+ifneq ($(KERNELRELEASE),) -+obj-m := ixp425_eth.o -+ -+else -+KDIR := /lib/modules/$(shell uname -r)/build -+PWD := $(shell pwd) -+ -+default modules: -+ $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules -+endif diff --git a/packages/ixp425-eth/files/mm4.patch b/packages/ixp425-eth/files/mm4.patch deleted file mode 100644 index c40aaca998..0000000000 --- a/packages/ixp425-eth/files/mm4.patch +++ /dev/null @@ -1,19 +0,0 @@ -# This corrects the type of dev_set_mac_address. The definition (prototype) -# was *added* to include/linux/netdevice.h in the 2.6.11 mm patches, so the -# change should not harm older builds ---- ixp425-eth-1.1-r1/ixp425_eth.c.pre-mm4 2005-03-19 14:02:32.883601440 -0800 -+++ ixp425-eth-1.1-r1/ixp425_eth.c 2005-03-19 14:03:25.849549392 -0800 -@@ -2347,12 +2347,11 @@ - } - - /* set port MAC addr and update the dev struct if successfull */ --int dev_set_mac_address(struct net_device *dev, void *addr) -+int dev_set_mac_address(struct net_device *dev, struct sockaddr *saddr) - { - int res; - priv_data_t *priv = dev->priv; - IxEthAccMacAddr npeMacAddr; -- struct sockaddr *saddr = (struct sockaddr *)addr; - - /* Set MAC addr in h/w */ - memcpy(&npeMacAddr.macAddress, diff --git a/packages/ixp425-eth/files/modprobe.conf b/packages/ixp425-eth/files/modprobe.conf deleted file mode 100644 index bfcbf916cf..0000000000 --- a/packages/ixp425-eth/files/modprobe.conf +++ /dev/null @@ -1,3 +0,0 @@ -# Add an alias for eth0 to ixp425_eth to cause the S40networking -# init script to load the ixp425_eth driver on the first boot -alias eth0 ixp425_eth diff --git a/packages/ixp425-eth/files/pollcontroller.patch b/packages/ixp425-eth/files/pollcontroller.patch deleted file mode 100644 index f95db28977..0000000000 --- a/packages/ixp425-eth/files/pollcontroller.patch +++ /dev/null @@ -1,50 +0,0 @@ -# Add a poll controller to the interface - required for netconsole ---- ixp425-eth-1.1-r1/ixp425_eth.c.pre-pollcontroller 2005-03-19 14:02:32.883601440 -0800 -+++ ixp425-eth-1.1-r1/ixp425_eth.c 2005-03-19 14:03:25.849549392 -0800 -@@ -273,6 +273,11 @@ - extern void - ixEthTxFrameDoneQMCallback(IxQMgrQId? qId, IxQMgrCallbackId? callbackId); - -+#ifdef CONFIG_NET_POLL_CONTROLLER -+/* poll controller (needed for netconsole et al) */ -+static void ixp425eth_poll_controller(struct net_device *dev); -+#endif -+ - /* Private device data */ - typedef struct { - unsigned int msdu_size; -@@ -2462,6 +2467,10 @@ - ndev->set_multicast_list = dev_set_multicast_list; - ndev->flags |= IFF_MULTICAST; - -+#ifdef CONFIG_NET_POLL_CONTROLLER -+ ndev->poll_controller = ixp425eth_poll_controller; -+#endif -+ - ndev->set_mac_address = dev_set_mac_address; - - memcpy(ndev->dev_addr, &default_mac_addr[priv->port_id].macAddress, -@@ -2491,6 +2500,23 @@ - return res; - } - -+ -+#ifdef CONFIG_NET_POLL_CONTROLLER -+/* -+ * Polling receive - used by netconsole and other diagnostic tools -+ * to allow network i/o with interrupts disabled. -+ * (stolen from 8139too.c by siddy) -+ */ -+static void ixp425eth_poll_controller(struct net_device *dev) -+{ -+ disable_irq(dev->irq); -+ dev_qmgr_os_isr(dev->irq, dev, NULL); -+ enable_irq(dev->irq); -+} -+#endif -+ -+ -+ - static int __devinit npe_eth_init_device(struct device *dev) - { - int res = -ENOMEM; diff --git a/packages/ixp425-eth/ixp400-eth-1.4/2.6.13.patch b/packages/ixp425-eth/ixp400-eth-1.4/2.6.13.patch deleted file mode 100644 index 376bb3b03b..0000000000 --- a/packages/ixp425-eth/ixp400-eth-1.4/2.6.13.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- ./ixp400_eth.c.orig 2005-10-02 18:55:03.998477844 -0700 -+++ ./ixp400_eth.c 2005-10-02 19:00:43.187821684 -0700 -@@ -848,7 +848,9 @@ - skb->pkt_type = PACKET_HOST; /* Default type */ - skb->ip_summed = 0; - skb->priority = 0; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - skb->security = 0; -+#endif - #ifdef CONFIG_NET_SCHED - skb->tc_index = 0; - #endif -@@ -2922,8 +2924,14 @@ - } - - /* set port MAC addr and update the dev struct if successfull */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - int dev_set_mac_address(struct net_device *dev, struct sockaddr *saddr) - { -+#else -+static int set_mac_address(struct net_device *dev, void *saddrIn) -+{ -+ struct sockaddr *saddr = saddrIn; -+#endif - int res; - priv_data_t *priv = dev->priv; - IxEthAccMacAddr npeMacAddr; -@@ -3073,7 +3081,11 @@ - ndev->get_stats = dev_get_stats; - ndev->set_multicast_list = dev_set_multicast_list; - ndev->flags |= IFF_MULTICAST; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13) - ndev->set_mac_address = dev_set_mac_address; -+#else -+ ndev->set_mac_address = set_mac_address; -+#endif - - TRACE; - diff --git a/packages/ixp425-eth/ixp400-eth-1.4/2.6.14-mm.patch b/packages/ixp425-eth/ixp400-eth-1.4/2.6.14-mm.patch deleted file mode 100644 index b2dfaaa4fe..0000000000 --- a/packages/ixp425-eth/ixp400-eth-1.4/2.6.14-mm.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- ./ixp400_eth.c.orig 2005-11-13 16:17:57.943717806 -0800 -+++ ./ixp400_eth.c 2005-11-13 16:29:00.829430574 -0800 -@@ -65,6 +65,10 @@ - #include <linux/sysctl.h> - #include <linux/unistd.h> - -+#ifndef to_platform_device -+#include <linux/platform_device.h> -+#endif -+ - /* - * Intel IXP400 Software specific header files - */ -@@ -2410,7 +2414,7 @@ dev_tx_timeout_work(void* arg) - } - - -- -+#if 0 - static void - dev_tx_timeout_task(void *dev_id) - { -@@ -2444,6 +2448,7 @@ dev_tx_timeout_task(void *dev_id) - - up(maintenance_mutex); - } -+#endif - - - /* This function is called when kernel thinks that TX is stuck */ -@@ -3274,9 +3279,12 @@ static struct net_device ixp400_devices[ - - int init_module(void) - { -- int res, dev_count; -+ int res; -+#if 0 -+ int dev_count; - IxEthAccPortId portId; - struct net_device *dev; -+#endif - int i; - TRACE; - diff --git a/packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch b/packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch deleted file mode 100644 index c4c19db795..0000000000 --- a/packages/ixp425-eth/ixp400-eth-1.4/2.6.14.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ./ixp400_eth.c 2005-10-01 00:50:45.179775259 -0700 -+++ ./ixp400_eth.c 2005-10-01 00:54:10.976725245 -0700 -@@ -777,7 +777,9 @@ - * before re-using it on the Rx-path - */ - skb->nfmark = 0; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) - skb->nfcache = 0; -+#endif - nf_conntrack_put(skb->nfct); - skb->nfct = NULL; - #ifdef CONFIG_NETFILTER_DEBUG -@@ -1451,7 +1453,11 @@ - skb->len -= header_len; - - /* fill the pkt arrival time (set at the irq callback entry) */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) - skb->stamp = irq_stamp; -+#else -+ skb_set_timestamp(skb, &irq_stamp); -+#endif - - /* fill the input device field */ - skb->dev = dev; diff --git a/packages/ixp425-eth/ixp400-eth-1.4/ixp400-le-be.patch b/packages/ixp425-eth/ixp400-eth-1.4/ixp400-le-be.patch deleted file mode 100644 index 87d4337eb3..0000000000 --- a/packages/ixp425-eth/ixp400-eth-1.4/ixp400-le-be.patch +++ /dev/null @@ -1,948 +0,0 @@ ---- ./.pc/ixp400-le-be.patch/ixp400_eth.c 2005-04-19 22:58:18.000000000 -0700 -+++ ./ixp400_eth.c 2005-10-23 23:29:06.760778566 -0700 -@@ -57,6 +57,7 @@ - #include <linux/mii.h> - #include <linux/socket.h> - #include <linux/cache.h> -+#include <linux/interrupt.h> - #include <asm/io.h> - #include <asm/errno.h> - #include <net/pkt_sched.h> -@@ -95,7 +96,7 @@ - MODULE_LICENSE("GPL"); - MODULE_AUTHOR("Intel Corporation"); - #define MODULE_NAME "ixp400_eth" --#define MODULE_VERSION "1.4" -+#define MODULE_VERSION_IXP400_ETH "1.4B" - - /* Module parameters */ - static int npe_learning = 1; /* default : NPE learning & filtering enable */ -@@ -358,8 +359,13 @@ - /* Used to stop the kernel thread for link monitoring. */ - volatile BOOL maintenanceCheckStopped; - -+ struct work_struct mii_job; -+ -+ - /* used for tx timeout */ -- struct tq_struct tq_timeout; -+ struct work_struct tx_timeout_job; -+ -+ - - /* used to control the message output */ - UINT32 devFlags; -@@ -557,6 +563,8 @@ - #endif - }; - -+static struct workqueue_struct *npe_eth_workqueue; -+ - /* Mutex lock used to coordinate access to IxEthAcc functions - * which manipulate the MII registers on the PHYs - */ -@@ -565,6 +573,11 @@ - /* mutex locked when maintenance is being performed */ - static struct semaphore *maintenance_mutex; - -+/* Flags which is set when corresponding NPE is running, -+ * cleared when NPE is stopped -+ */ -+static int npeRunning[IX_ETH_ACC_NUMBER_OF_PORTS]; -+ - /* Flags which is set when the corresponding IRQ is running, - */ - static int irq_pmu_used = 0; -@@ -1070,6 +1083,117 @@ - return 0; - } - -+/* -+ * WORKQUEUE JOBS -+ */ -+ -+/* This workqueue job will check the PHY for the link duplex and -+ * update the MAC accordingly. It also executes some buffer -+ * maintenance to release mbuf in excess or replenish after -+ * a severe starvation -+ * -+ * This function loops and wake up every 3 seconds. -+ */ -+static void dev_media_check_work(void* arg) -+{ -+ struct net_device *dev = (struct net_device *) arg; -+ priv_data_t *priv = dev->priv; -+ -+ TRACE; -+ -+ /* -+ * Determine the link status -+ */ -+ -+ if (default_phy_cfg[priv->port_id].linkMonitor) -+ { -+ int linkUp; -+ int speed100; -+ int fullDuplex = -1; /* unknown duplex mode */ -+ int newDuplex; -+ int autonegotiate; -+ unsigned phyNum = phyAddresses[priv->port_id]; -+ int res; -+ -+ TRACE; -+ |