diff options
Diffstat (limited to 'release/src/linux/linux/drivers')
| -rw-r--r-- | release/src/linux/linux/drivers/char/serial.c | 4 | ||||
| -rw-r--r-- | release/src/linux/linux/drivers/mtd/chips/gen_probe.c | 1 | ||||
| -rw-r--r-- | release/src/linux/linux/drivers/net/Config.in | 5 | ||||
| -rw-r--r-- | release/src/linux/linux/drivers/net/Makefile | 15 | ||||
| -rwxr-xr-x[-rw-r--r--] | release/src/linux/linux/drivers/net/hnd/shared_ksyms.sh | 6 | ||||
| -rw-r--r-- | release/src/linux/linux/drivers/net/imq.c | 321 | ||||
| -rw-r--r-- | release/src/linux/linux/drivers/net/ppp_generic.c | 47 |
7 files changed, 378 insertions, 21 deletions
diff --git a/release/src/linux/linux/drivers/char/serial.c b/release/src/linux/linux/drivers/char/serial.c index 287eda33..dd3d7de4 100644 --- a/release/src/linux/linux/drivers/char/serial.c +++ b/release/src/linux/linux/drivers/char/serial.c @@ -2861,9 +2861,9 @@ static void rs_close(struct tty_struct *tty, struct file * filp) info->event = 0; info->tty = 0; if (info->blocked_open) { - if (info->close_delay) { + if (state->close_delay) { set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(info->close_delay); + schedule_timeout(state->close_delay); } wake_up_interruptible(&info->open_wait); } diff --git a/release/src/linux/linux/drivers/mtd/chips/gen_probe.c b/release/src/linux/linux/drivers/mtd/chips/gen_probe.c index 4bed4f12..45ea742b 100644 --- a/release/src/linux/linux/drivers/mtd/chips/gen_probe.c +++ b/release/src/linux/linux/drivers/mtd/chips/gen_probe.c @@ -287,6 +287,7 @@ static struct mtd_info *check_cmd_set(struct map_info *map, int primary) #endif #ifdef CONFIG_MTD_CFI_AMDSTD case 0x0002: + case 0x0006: /* for Winbond W19L320SBT9C */ return cfi_cmdset_0002(map, primary); #endif #ifdef CONFIG_MTD_CFI_SSTSTD diff --git a/release/src/linux/linux/drivers/net/Config.in b/release/src/linux/linux/drivers/net/Config.in index 59de9c9e..9a79c778 100644 --- a/release/src/linux/linux/drivers/net/Config.in +++ b/release/src/linux/linux/drivers/net/Config.in @@ -8,6 +8,11 @@ source drivers/net/arcnet/Config.in tristate 'Dummy net driver support' CONFIG_DUMMY tristate 'Bonding driver support' CONFIG_BONDING tristate 'EQL (serial line load balancing) support' CONFIG_EQUALIZER +if [ "$CONFIG_NETFILTER" = "y" ]; then + tristate 'IMQ (intermediate queueing device) support' CONFIG_IMQ +else + comment 'IMQ needs CONFIG_NETFILTER enabled' +fi tristate 'Universal TUN/TAP device driver support' CONFIG_TUN if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then tristate 'Ethertap network tap (OBSOLETE)' CONFIG_ETHERTAP diff --git a/release/src/linux/linux/drivers/net/Makefile b/release/src/linux/linux/drivers/net/Makefile index acdea2cf..adec92ce 100644 --- a/release/src/linux/linux/drivers/net/Makefile +++ b/release/src/linux/linux/drivers/net/Makefile @@ -30,13 +30,13 @@ subdir-m += diag #subdir-m += ext_io #subdir-m += ctmisc -ifeq ($(CONFIG_HW_QOS),y) -subdir-m += port_based_qos -else - ifeq ($(CONFIG_PERFORMANCE),y) - subdir-m += port_based_qos - endif -endif +# ifeq ($(CONFIG_HW_QOS),y) +# subdir-m += port_based_qos +# else +# ifeq ($(CONFIG_PERFORMANCE),y) +# subdir-m += port_based_qos +# endif +# endif ifeq ($(CONFIG_TULIP),y) obj-y += tulip/tulip.o @@ -174,6 +174,7 @@ endif obj-$(CONFIG_STRIP) += strip.o obj-$(CONFIG_DUMMY) += dummy.o +obj-$(CONFIG_IMQ) += imq.o obj-$(CONFIG_BONDING) += bonding.o obj-$(CONFIG_DE600) += de600.o obj-$(CONFIG_DE620) += de620.o diff --git a/release/src/linux/linux/drivers/net/hnd/shared_ksyms.sh b/release/src/linux/linux/drivers/net/hnd/shared_ksyms.sh index 7814f7f0..a4454bea 100644..100755 --- a/release/src/linux/linux/drivers/net/hnd/shared_ksyms.sh +++ b/release/src/linux/linux/drivers/net/hnd/shared_ksyms.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2005, Broadcom Corporation +# Copyright 2006, Broadcom Corporation # All Rights Reserved. # # THIS SOFTWARE IS OFFERED "AS IS", AND BROADCOM GRANTS NO WARRANTIES OF ANY @@ -8,7 +8,7 @@ # SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS # FOR A SPECIFIC PURPOSE OR NONINFRINGEMENT CONCERNING THIS SOFTWARE. # -# $Id: shared_ksyms.sh,v 1.1.1.7 2005/03/07 07:30:48 kanki Exp $ +# $Id$ # cat <<EOF @@ -17,5 +17,5 @@ cat <<EOF EOF for file in $* ; do - ${NM} $file | sed -ne 's/[0-9A-Fa-f]* [DT] \([^ ]*\)/extern void \1; EXPORT_SYMBOL(\1);/p' + ${NM} $file | sed -ne 's/[0-9A-Fa-f]* [DRT] \([^ ]*\)/extern void \1; EXPORT_SYMBOL(\1);/p' done diff --git a/release/src/linux/linux/drivers/net/imq.c b/release/src/linux/linux/drivers/net/imq.c new file mode 100644 index 00000000..ac687dba --- /dev/null +++ b/release/src/linux/linux/drivers/net/imq.c @@ -0,0 +1,321 @@ +/* + * Pseudo-driver for the intermediate queue device. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + * + * Authors: Patrick McHardy, <kaber@trash.net> + * + * The first version was written by Martin Devera, <devik@cdi.cz> + * + * Credits: Jan Rafaj <imq2t@cedric.vabo.cz> + * - Update patch to 2.4.21 + * Sebastian Strollo <sstrollo@nortelnetworks.com> + * - Fix "Dead-loop on netdevice imq"-issue + */ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/config.h> +#include <linux/skbuff.h> +#include <linux/netdevice.h> +#include <linux/rtnetlink.h> +#include <linux/if_arp.h> +#include <linux/netfilter.h> +#include <linux/netfilter_ipv4.h> +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) +#include <linux/netfilter_ipv6.h> +#endif +#include <linux/imq.h> +#include <net/pkt_sched.h> + +static nf_hookfn imq_nf_hook; + +static struct nf_hook_ops imq_ingress_ipv4 = { + { NULL, NULL}, + imq_nf_hook, + PF_INET, + NF_IP_PRE_ROUTING, + NF_IP_PRI_MANGLE + 1 +}; + +static struct nf_hook_ops imq_egress_ipv4 = { + { NULL, NULL}, + imq_nf_hook, + PF_INET, + NF_IP_POST_ROUTING, + NF_IP_PRI_LAST +}; + +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) +static struct nf_hook_ops imq_ingress_ipv6 = { + { NULL, NULL}, + imq_nf_hook, + PF_INET6, + NF_IP6_PRE_ROUTING, + NF_IP6_PRI_MANGLE + 1 +}; + +static struct nf_hook_ops imq_egress_ipv6 = { + { NULL, NULL}, + imq_nf_hook, + PF_INET6, + NF_IP6_POST_ROUTING, + NF_IP6_PRI_LAST +}; +#endif + +static unsigned int numdevs = 2; + +MODULE_PARM(numdevs, "i"); +MODULE_PARM_DESC(numdevs, "number of imq devices"); + +static struct net_device *imq_devs; + + +static struct net_device_stats *imq_get_stats(struct net_device *dev) +{ + return (struct net_device_stats *)dev->priv; +} + +/* called for packets kfree'd in qdiscs at places other than enqueue */ +static void imq_skb_destructor(struct sk_buff *skb) +{ + struct nf_info *info = skb->nf_info; + + if (info) { + if (info->indev) + dev_put(info->indev); + if (info->outdev) + dev_put(info->outdev); + kfree(info); + } +} + +static int imq_dev_xmit(struct sk_buff *skb, struct net_device *dev) +{ + struct net_device_stats *stats = (struct net_device_stats*) dev->priv; + + stats->tx_bytes += skb->len; + stats->tx_packets++; + + skb->imq_flags = 0; + skb->destructor = NULL; + + dev->trans_start = jiffies; + nf_reinject(skb, skb->nf_info, NF_ACCEPT); + return 0; +} + +static int imq_nf_queue(struct sk_buff *skb, struct nf_info *info, + void *data) +{ + struct net_device *dev; + struct net_device_stats *stats; + struct sk_buff *skb2 = NULL; + struct Qdisc *q; + unsigned int index = skb->imq_flags&IMQ_F_IFMASK; + int ret = -1; + + if (index > numdevs) + return -1; + + dev = imq_devs + index; + if (!(dev->flags & IFF_UP)) { + skb->imq_flags = 0; + nf_reinject(skb, info, NF_ACCEPT); + return 0; + } + dev->last_rx = jiffies; + + if (skb->destructor) { + skb2 = skb; + skb = skb_clone(skb, GFP_ATOMIC); + if (!skb) + return -1; + } + skb->nf_info = info; + + stats = (struct net_device_stats *)dev->priv; + stats->rx_bytes+= skb->len; + stats->rx_packets++; + + spin_lock_bh(&dev->queue_lock); + q = dev->qdisc; + if (q->enqueue) { + q->enqueue(skb_get(skb), q); + if (skb_shared(skb)) { + skb->destructor = imq_skb_destructor; + kfree_skb(skb); + ret = 0; + } + } + if (spin_is_locked(&dev->xmit_lock)) + netif_schedule(dev); + else + qdisc_run(dev); + spin_unlock_bh(&dev->queue_lock); + + if (skb2) + kfree_skb(ret ? skb : skb2); + + return ret; +} + +static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff **pskb, + const struct net_device *indev, + const struct net_device *outdev, + int (*okfn)(struct sk_buff *)) +{ + if ((*pskb)->imq_flags & IMQ_F_ENQUEUE) + return NF_QUEUE; + + return NF_ACCEPT; +} + + +static int __init imq_init_hooks(void) +{ + int err; + + if ((err = nf_register_queue_handler(PF_INET, imq_nf_queue, NULL))) + goto err1; + if ((err = nf_register_hook(&imq_ingress_ipv4))) + goto err2; + if ((err = nf_register_hook(&imq_egress_ipv4))) + goto err3; +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) + if ((err = nf_register_queue_handler(PF_INET6, imq_nf_queue, NULL))) + goto err4; + if ((err = nf_register_hook(&imq_ingress_ipv6))) + goto err5; + if ((err = nf_register_hook(&imq_egress_ipv6))) + goto err6; +#endif + + return 0; + +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) +err6: + nf_unregister_hook(&imq_ingress_ipv6); +err5: + nf_unregister_queue_handler(PF_INET6); +err4: + nf_unregister_hook(&imq_egress_ipv4); +#endif +err3: + nf_unregister_hook(&imq_ingress_ipv4); +err2: + nf_unregister_queue_handler(PF_INET); +err1: + return err; +} + +static void __exit imq_unhook(void) +{ + nf_unregister_hook(&imq_ingress_ipv4); + nf_unregister_hook(&imq_egress_ipv4); + nf_unregister_queue_handler(PF_INET); +#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) + nf_unregister_hook(&imq_ingress_ipv6); + nf_unregister_hook(&imq_egress_ipv6); + nf_unregister_queue_handler(PF_INET6); +#endif +} + +static int __init imq_dev_init(struct net_device *dev) +{ + dev->hard_start_xmit = imq_dev_xmit; + dev->type = ARPHRD_VOID; + dev->mtu = 1500; + dev->tx_queue_len = 30; + dev->flags = IFF_NOARP; + dev->priv = kmalloc(sizeof(struct net_device_stats), GFP_KERNEL); + if (dev->priv == NULL) + return -ENOMEM; + memset(dev->priv, 0, sizeof(struct net_device_stats)); + dev->get_stats = imq_get_stats; + + return 0; +} + +static void imq_dev_uninit(struct net_device *dev) +{ + kfree(dev->priv); +} + +static int __init imq_init_devs(void) +{ + struct net_device *dev; + int i; + + if (!numdevs || numdevs > IMQ_MAX_DEVS) { + printk(KERN_ERR "numdevs has to be betweed 1 and %u\n", + IMQ_MAX_DEVS); + return -EINVAL; + } + + imq_devs = kmalloc(sizeof(struct net_device) * numdevs, GFP_KERNEL); + if (!imq_devs) + return -ENOMEM; + memset(imq_devs, 0, sizeof(struct net_device) * numdevs); + + /* we start counting at zero */ + numdevs--; + + for (i = 0, dev = imq_devs; i <= numdevs; i++, dev++) { + SET_MODULE_OWNER(dev); + strcpy(dev->name, "imq%d"); + dev->init = imq_dev_init; + dev->uninit = imq_dev_uninit; + + if (register_netdev(dev) < 0) + goto err_register; + } + return 0; + +err_register: + for (; i; i--) + unregister_netdev(--dev); + kfree(imq_devs); + return -EIO; +} + +static void imq_cleanup_devs(void) +{ + int i; + struct net_device *dev = imq_devs; + + for (i = 0; i <= numdevs; i++) + unregister_netdev(dev++); + + kfree(imq_devs); +} + +static int __init imq_init_module(void) +{ + int err; + + if ((err = imq_init_devs())) + return err; + if ((err = imq_init_hooks())) { + imq_cleanup_devs(); + return err; + } + + printk(KERN_INFO "imq driver loaded.\n"); + + return 0; +} + +static void __exit imq_cleanup_module(void) +{ + imq_unhook(); + imq_cleanup_devs(); +} + +module_init(imq_init_module); +module_exit(imq_cleanup_module); +MODULE_LICENSE("GPL"); diff --git a/release/src/linux/linux/drivers/net/ppp_generic.c b/release/src/linux/linux/drivers/net/ppp_generic.c index 3a4e0fb8..ed4e243a 100644 --- a/release/src/linux/linux/drivers/net/ppp_generic.c +++ b/release/src/linux/linux/drivers/net/ppp_generic.c @@ -221,7 +221,7 @@ static atomic_t channel_count = ATOMIC_INIT(0); #define DST_PORT(skb) (((skb)->data[24] << 8) + (skb)->data[25]) #define MARK_LAN2WAN 0x100 //#define myprintk(fmt, args...) printk(fmt, ## args) -#define myprintk(fmt, args...) +#define myprintk(fmt, args...) /* We limit the length of ppp->file.rq to this (arbitrary) value */ @@ -301,7 +301,7 @@ static const int npindex_to_proto[NUM_NP] = { PPP_IPX, PPP_AT, }; - + /* Translates an ethertype into an NP index */ static inline int ethertype_to_npindex(int ethertype) { @@ -987,6 +987,34 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) ppp->last_xmit = jiffies; skb_pull(skb, 2); #else + +#if 1 // zzz + switch (IP_PROTO(skb)) { + case 6: // TCP + switch (DST_PORT(skb)) { + case 139: // netbios-ssn + case 445: // microsoft-ds + break; + default: + ppp->last_xmit = jiffies; + break; + } + break; + case 17: // UDP + switch (DST_PORT(skb)) { + case 137: // netbios-ns + case 138: // netbios-dgm + break; + default: + ppp->last_xmit = jiffies; + break; + } + break; + default: + ppp->last_xmit = jiffies; + break; + } +#else /* for data packets, record the time */ myprintk(KERN_DEBUG "PPP: (%ld) send nfmark=[%lx] proto[%d] port[%d -> %d]\n", jiffies, @@ -1007,7 +1035,8 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) } else myprintk(KERN_DEBUG "PPP: No reset timer\n"); - +#endif + #endif /* CONFIG_PPP_FILTER */ } @@ -1543,7 +1572,7 @@ ppp_receive_nonmp_frame(struct ppp *ppp, struct sk_buff *skb) //else if(UDP_PORT(skb) == 138){ // printk(KERN_DEBUG " Skip NETBIOS Datagram Service packet\n"); //} - //else if(IP_PROTO(skb) == 2){ + //else if(IP_PROTO(skb) == 2){ // printk(KERN_DEBUG " Skip IGMP packet\n"); //} //else @@ -2053,7 +2082,7 @@ ppp_ccp_peek(struct ppp *ppp, struct sk_buff *skb, int inbound) switch (CCP_CODE(dp)) { case CCP_CONFREQ: - /* A ConfReq starts negotiation of compression + /* A ConfReq starts negotiation of compression * in one direction of transmission, * and hence brings it down...but which way? * @@ -2063,16 +2092,16 @@ ppp_ccp_peek(struct ppp *ppp, struct sk_buff *skb, int inbound) if(inbound) /* He is proposing what I should send */ ppp->xstate &= ~SC_COMP_RUN; - else + else /* I am proposing to what he should send */ ppp->rstate &= ~SC_DECOMP_RUN; - + break; - + case CCP_TERMREQ: case CCP_TERMACK: /* - * CCP is going down, both directions of transmission + * CCP is going down, both directions of transmission */ ppp->rstate &= ~SC_DECOMP_RUN; ppp->xstate &= ~SC_COMP_RUN; |