Author: arekm Date: Sun Jan 11 16:18:59 2009 GMT
Module: SOURCES Tag: LINUX_2_6_27
---- Log message:
- update by Gregory Nietsky gregory at dnstelecom.co.za
---- Files affected:
SOURCES:
kernel-imq.patch (1.1.2.1.2.13 -> 1.1.2.1.2.13.2.1)
---- Diffs:
================================================================
Index: SOURCES/kernel-imq.patch
diff -u SOURCES/kernel-imq.patch:1.1.2.1.2.13
SOURCES/kernel-imq.patch:1.1.2.1.2.13.2.1
--- SOURCES/kernel-imq.patch:1.1.2.1.2.13 Wed Dec 17 21:19:45 2008
+++ SOURCES/kernel-imq.patch Sun Jan 11 17:18:53 2009
@@ -1,6 +1,7 @@
---- linux-2.6.25.7/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.25.7.imq/drivers/net/imq.c 2008-06-17 15:03:01.000000000
+0300
-@@ -0,0 +1,474 @@
+diff -urN linux-2.6.27.org/drivers/net/imq.c linux-2.6.27/drivers/net/imq.c
+--- linux-2.6.27.org/drivers/net/imq.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.27/drivers/net/imq.c 2009-01-11 17:16:26.608878570 +0100
+@@ -0,0 +1,500 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -79,7 +80,7 @@
+
+struct imq_private {
+ struct tasklet_struct tasklet;
-+ int tasklet_pending;
++ long tasklet_pending[1];
+};
+
+static nf_hookfn imq_nf_hook;
@@ -141,6 +142,22 @@
+#endif
+
+static struct net_device *imq_devs_cache[IMQ_MAX_DEVS];
++static struct lock_class_key imq_netdev_xmit_lock_key[IMQ_MAX_DEVS];
++static struct lock_class_key imq_netdev_addr_lock_key[IMQ_MAX_DEVS];
++
++static void imq_set_lockdep_class_one(struct net_device *dev,
++ struct netdev_queue *txq,
++ void *data)
++{
++ int *index=(int*)data;
++ lockdep_set_class(&txq->_xmit_lock, &imq_netdev_xmit_lock_key[*index]);
++}
++
++static void imq_set_lockdep_class(struct net_device *dev, int index)
++{
++ lockdep_set_class(&dev->addr_list_lock,
&imq_netdev_addr_lock_key[index]);
++ netdev_for_each_tx_queue(dev, imq_set_lockdep_class_one, &index);
++}
+
+static struct net_device_stats *imq_get_stats(struct net_device *dev)
+{
@@ -179,7 +196,10 @@
+ struct net_device *dev;
+ struct imq_private *priv;
+ struct sk_buff *skb2 = NULL;
++ struct netdev_queue *txq;
+ struct Qdisc *q;
++ spinlock_t *root_lock;
++
+ unsigned int index = entry->skb->imq_flags & IMQ_F_IFMASK;
+ int ret = -1;
+
@@ -222,8 +242,10 @@
+ dev->stats.rx_bytes += entry->skb->len;
+ dev->stats.rx_packets++;
+
-+ spin_lock_bh(&dev->queue_lock);
-+ q = dev->qdisc;
++ txq = netdev_get_tx_queue(dev, queue_num);
++ q = txq->qdisc;
++ root_lock = qdisc_lock(q);
++ spin_lock_bh(root_lock);
+ if (q->enqueue) {
+ q->enqueue(skb_get(entry->skb), q);
+ if (skb_shared(entry->skb)) {
@@ -232,9 +254,9 @@
+ ret = 0;
+ }
+ }
-+ if (!test_and_set_bit(1, &priv->tasklet_pending))
++ if (!test_and_set_bit(1, &priv->tasklet_pending[queue_num]))
+ tasklet_schedule(&priv->tasklet);
-+ spin_unlock_bh(&dev->queue_lock);
++ spin_unlock_bh(root_lock);
+
+ if (skb2)
+ kfree_skb(ret ? entry->skb : skb2);
@@ -251,11 +273,14 @@
+{
+ struct net_device *dev = (struct net_device *)arg;
+ struct imq_private *priv = netdev_priv(dev);
-+
-+ spin_lock(&dev->queue_lock);
-+ qdisc_run(dev);
-+ clear_bit(1, &priv->tasklet_pending);
-+ spin_unlock(&dev->queue_lock);
++ struct netdev_queue *txq = netdev_get_tx_queue(dev, 0);
++ struct Qdisc *q = txq->qdisc;
++ spinlock_t *root_lock = qdisc_lock(q);
++
++ spin_lock(root_lock);
++ qdisc_run(q);
++ clear_bit(1, &priv->tasklet_pending[0]);
++ spin_unlock(root_lock);
+}
+
+static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
@@ -365,6 +390,8 @@
+ return -ENOMEM;
+
+ ret = dev_alloc_name(dev, dev->name);
++ dev->num_tx_queues=1;
++ imq_set_lockdep_class(dev, index);
+ if (ret < 0)
+ goto fail;
+
@@ -475,9 +502,10 @@
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("imq");
+
---- linux-2.6.25.7/drivers/net/Kconfig 2008-06-16 23:24:36.000000000 +0300
-+++ linux-2.6.25.7.imq/drivers/net/Kconfig 2008-06-17 15:03:21.000000000
+0300
-@@ -117,6 +117,129 @@
+diff -urN linux-2.6.27.org/drivers/net/Kconfig linux-2.6.27/drivers/net/Kconfig
+--- linux-2.6.27.org/drivers/net/Kconfig 2009-01-11 17:08:24.201024820
+0100
++++ linux-2.6.27/drivers/net/Kconfig 2009-01-11 17:16:26.605321939 +0100
+@@ -109,6 +109,129 @@
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -607,9 +635,10 @@
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
---- linux-2.6.25.7/drivers/net/Makefile 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/drivers/net/Makefile 2008-06-17 14:56:58.000000000
+0300
-@@ -143,6 +143,7 @@
+diff -urN linux-2.6.27.org/drivers/net/Makefile
linux-2.6.27/drivers/net/Makefile
+--- linux-2.6.27.org/drivers/net/Makefile 2008-10-10 00:13:53.000000000
+0200
++++ linux-2.6.27/drivers/net/Makefile 2009-01-11 17:16:26.608878570 +0100
+@@ -144,6 +144,7 @@
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@@ -617,8 +646,9 @@
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
obj-$(CONFIG_DE600) += de600.o
---- linux-2.6.25.7/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-2.6.25.7.imq/include/linux/imq.h 2008-06-17 14:56:58.000000000
+0300
+diff -urN linux-2.6.27.org/include/linux/imq.h linux-2.6.27/include/linux/imq.h
+--- linux-2.6.27.org/include/linux/imq.h 1970-01-01 01:00:00.000000000
+0100
++++ linux-2.6.27/include/linux/imq.h 2009-01-11 17:16:26.624402721 +0100
@@ -0,0 +1,9 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -629,8 +659,9 @@
+#define IMQ_F_ENQUEUE 0x80
+
+#endif /* _IMQ_H */
---- linux-2.6.25.7/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01
02:00:00.000000000 +0200
-+++ linux-2.6.25.7.imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2008-06-17
14:56:58.000000000 +0300
+diff -urN linux-2.6.27.org/include/linux/netfilter_ipv4/ipt_IMQ.h
linux-2.6.27/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-2.6.27.org/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.27/include/linux/netfilter_ipv4/ipt_IMQ.h 2009-01-11
17:16:26.624402721 +0100
@@ -0,0 +1,8 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -640,8 +671,9 @@
+};
+
+#endif /* _IPT_IMQ_H */
---- linux-2.6.25.7/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01
02:00:00.000000000 +0200
-+++ linux-2.6.25.7.imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2008-06-17
14:56:58.000000000 +0300
+diff -urN linux-2.6.27.org/include/linux/netfilter_ipv6/ip6t_IMQ.h
linux-2.6.27/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-2.6.27.org/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.27/include/linux/netfilter_ipv6/ip6t_IMQ.h 2009-01-11
17:16:26.624402721 +0100
@@ -0,0 +1,8 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -651,9 +683,10 @@
+};
+
+#endif /* _IP6T_IMQ_H */
---- linux-2.6.25.7/include/linux/skbuff.h 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/include/linux/skbuff.h 2008-06-17 14:56:58.000000000
+0300
-@@ -296,6 +296,10 @@
+diff -urN linux-2.6.27.org/include/linux/skbuff.h
linux-2.6.27/include/linux/skbuff.h
+--- linux-2.6.27.org/include/linux/skbuff.h 2008-10-10 00:13:53.000000000
+0200
++++ linux-2.6.27/include/linux/skbuff.h 2009-01-11 17:16:26.624402721
+0100
+@@ -302,6 +302,10 @@
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@@ -664,7 +697,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -1736,6 +1740,10 @@
+@@ -1642,6 +1646,10 @@
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@@ -675,9 +708,10 @@
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
---- linux-2.6.25.7/net/core/dev.c 2008-06-16 23:24:36.000000000 +0300
-+++ linux-2.6.25.7.imq/net/core/dev.c 2008-06-17 14:56:58.000000000 +0300
-@@ -95,6 +95,9 @@
+diff -urN linux-2.6.27.org/net/core/dev.c linux-2.6.27/net/core/dev.c
+--- linux-2.6.27.org/net/core/dev.c 2009-01-11 17:08:24.484360310 +0100
++++ linux-2.6.27/net/core/dev.c 2009-01-11 17:16:26.628877583 +0100
+@@ -96,6 +96,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
#include <linux/rtnetlink.h>
@@ -687,8 +721,8 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1537,7 +1540,11 @@
- int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+@@ -1624,7 +1627,11 @@
+ struct netdev_queue *txq)
{
if (likely(!skb->next)) {
- if (!list_empty(&ptype_all))
@@ -700,9 +734,10 @@
dev_queue_xmit_nit(skb, dev);
if (netif_needs_gso(dev, skb)) {
---- linux-2.6.25.7/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01
02:00:00.000000000 +0200
-+++ linux-2.6.25.7.imq/net/ipv4/netfilter/ipt_IMQ.c 2008-06-17
14:56:58.000000000 +0300
-@@ -0,0 +1,69 @@
+diff -urN linux-2.6.27.org/net/ipv4/netfilter/ipt_IMQ.c
linux-2.6.27/net/ipv4/netfilter/ipt_IMQ.c
+--- linux-2.6.27.org/net/ipv4/netfilter/ipt_IMQ.c 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.27/net/ipv4/netfilter/ipt_IMQ.c 2009-01-11 17:16:26.631246773
+0100
+@@ -0,0 +1,58 @@
+/*
+ * This target marks packets to be enqueued to an imq device
+ */
@@ -712,29 +747,18 @@
+#include <linux/netfilter_ipv4/ipt_IMQ.h>
+#include <linux/imq.h>
+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+ const struct net_device *in,
-+ const struct net_device *out,
-+ unsigned int hooknum,
-+ const struct xt_target *target,
-+ const void *targinfo)
++static unsigned int imq_target(struct sk_buff *pskb, const struct
xt_target_param *target)
+{
-+ struct ipt_imq_info *mr = (struct ipt_imq_info *)targinfo;
++ struct ipt_imq_info *mr = (struct ipt_imq_info *)target->targinfo;
+
+ pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
+
+ return XT_CONTINUE;
+}
+
-+static bool imq_checkentry(const char *tablename,
-+ const void *e,
-+ const struct xt_target *target,
-+ void *targinfo,
-+ unsigned int hook_mask)
++static bool imq_checkentry(const struct xt_tgchk_param *target)
+{
-+ struct ipt_imq_info *mr;
-+
-+ mr = (struct ipt_imq_info *)targinfo;
++ struct ipt_imq_info *mr = (struct ipt_imq_info *)target->targinfo;
+
+ if (mr->todev > IMQ_MAX_DEVS) {
+ printk(KERN_WARNING
@@ -772,8 +796,9 @@
+MODULE_AUTHOR("http://www.linuximq.net";);
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See
http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
---- linux-2.6.25.7/net/ipv4/netfilter/Kconfig 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/net/ipv4/netfilter/Kconfig 2008-06-17
14:56:58.000000000 +0300
+diff -urN linux-2.6.27.org/net/ipv4/netfilter/Kconfig
linux-2.6.27/net/ipv4/netfilter/Kconfig
+--- linux-2.6.27.org/net/ipv4/netfilter/Kconfig 2009-01-11
17:08:24.774134145 +0100
++++ linux-2.6.27/net/ipv4/netfilter/Kconfig 2009-01-11 17:16:26.628877583
+0100
@@ -123,6 +123,17 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -792,9 +817,10 @@
config IP_NF_TARGET_REJECT
tristate "REJECT target support"
depends on IP_NF_FILTER
---- linux-2.6.25.7/net/ipv4/netfilter/Makefile 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/net/ipv4/netfilter/Makefile 2008-06-17
14:56:58.000000000 +0300
-@@ -51,6 +51,7 @@
+diff -urN linux-2.6.27.org/net/ipv4/netfilter/Makefile
linux-2.6.27/net/ipv4/netfilter/Makefile
+--- linux-2.6.27.org/net/ipv4/netfilter/Makefile 2009-01-11
17:08:24.774134145 +0100
++++ linux-2.6.27/net/ipv4/netfilter/Makefile 2009-01-11 17:16:46.727417283
+0100
+@@ -60,6 +60,7 @@
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
@@ -802,9 +828,10 @@
obj-$(CONFIG_IP_NF_TARGET_IPV4OPTSSTRIP) += ipt_IPV4OPTSSTRIP.o
obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
---- linux-2.6.25.7/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01
02:00:00.000000000 +0200
-+++ linux-2.6.25.7.imq/net/ipv6/netfilter/ip6t_IMQ.c 2008-06-17
14:56:58.000000000 +0300
-@@ -0,0 +1,69 @@
+diff -urN linux-2.6.27.org/net/ipv6/netfilter/ip6t_IMQ.c
linux-2.6.27/net/ipv6/netfilter/ip6t_IMQ.c
+--- linux-2.6.27.org/net/ipv6/netfilter/ip6t_IMQ.c 1970-01-01
01:00:00.000000000 +0100
++++ linux-2.6.27/net/ipv6/netfilter/ip6t_IMQ.c 2009-01-11 17:16:26.631246773
+0100
+@@ -0,0 +1,58 @@
+/*
+ * This target marks packets to be enqueued to an imq device
+ */
@@ -814,29 +841,18 @@
+#include <linux/netfilter_ipv6/ip6t_IMQ.h>
+#include <linux/imq.h>
+
-+static unsigned int imq_target(struct sk_buff *pskb,
-+ const struct net_device *in,
-+ const struct net_device *out,
-+ unsigned int hooknum,
-+ const struct xt_target *target,
-+ const void *targinfo)
++static unsigned int imq_target(struct sk_buff *pskb, const struct
xt_target_param *target)
+{
-+ struct ip6t_imq_info *mr = (struct ip6t_imq_info *)targinfo;
++ struct ip6t_imq_info *mr = (struct ip6t_imq_info *)target->targinfo;
+
+ pskb->imq_flags = mr->todev | IMQ_F_ENQUEUE;
+
+ return XT_CONTINUE;
+}
+
-+static bool imq_checkentry(const char *tablename,
-+ const void *entry,
-+ const struct xt_target *target,
-+ void *targinfo,
-+ unsigned int hook_mask)
++static bool imq_checkentry(const struct xt_tgchk_param *target)
+{
-+ struct ip6t_imq_info *mr;
-+
-+ mr = (struct ip6t_imq_info *)targinfo;
++ struct ip6t_imq_info *mr = (struct ip6t_imq_info *)target->targinfo;
+
+ if (mr->todev > IMQ_MAX_DEVS) {
+ printk(KERN_WARNING
@@ -874,8 +890,9 @@
+MODULE_AUTHOR("http://www.linuximq.net";);
+MODULE_DESCRIPTION("Pseudo-driver for the intermediate queue device. See
http://www.linuximq.net/ for more information.");
+MODULE_LICENSE("GPL");
---- linux-2.6.25.7/net/ipv6/netfilter/Kconfig 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/net/ipv6/netfilter/Kconfig 2008-06-17
14:56:58.000000000 +0300
+diff -urN linux-2.6.27.org/net/ipv6/netfilter/Kconfig
linux-2.6.27/net/ipv6/netfilter/Kconfig
+--- linux-2.6.27.org/net/ipv6/netfilter/Kconfig 2009-01-11
17:08:24.720800755 +0100
++++ linux-2.6.27/net/ipv6/netfilter/Kconfig 2009-01-11 17:16:26.631246773
+0100
@@ -179,6 +179,15 @@
To compile it as a module, choose M here. If unsure, say N.
@@ -892,8 +909,9 @@
config IP6_NF_TARGET_HL
tristate 'HL (hoplimit) target support'
depends on IP6_NF_MANGLE
---- linux-2.6.25.7/net/ipv6/netfilter/Makefile 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/net/ipv6/netfilter/Makefile 2008-06-17
14:56:58.000000000 +0300
+diff -urN linux-2.6.27.org/net/ipv6/netfilter/Makefile
linux-2.6.27/net/ipv6/netfilter/Makefile
+--- linux-2.6.27.org/net/ipv6/netfilter/Makefile 2009-01-11
17:08:24.720800755 +0100
++++ linux-2.6.27/net/ipv6/netfilter/Makefile 2009-01-11 17:16:26.631246773
+0100
@@ -6,6 +6,7 @@
obj-$(CONFIG_IP6_NF_IPTABLES) += ip6_tables.o
obj-$(CONFIG_IP6_NF_FILTER) += ip6table_filter.o
@@ -901,60 +919,15 @@
+obj-$(CONFIG_IP6_NF_TARGET_IMQ) += ip6t_IMQ.o
obj-$(CONFIG_IP6_NF_QUEUE) += ip6_queue.o
obj-$(CONFIG_IP6_NF_RAW) += ip6table_raw.o
+ obj-$(CONFIG_IP6_NF_SECURITY) += ip6table_security.o
+diff -urN linux-2.6.27.org/net/sched/sch_generic.c
linux-2.6.27/net/sched/sch_generic.c
+--- linux-2.6.27.org/net/sched/sch_generic.c 2009-01-11 17:08:24.498092451
+0100
++++ linux-2.6.27/net/sched/sch_generic.c 2009-01-11 17:16:26.631246773
+0100
+@@ -188,6 +188,7 @@
---- linux-2.6.25.7/net/sched/sch_generic.c 2008-06-16 23:24:36.000000000
+0300
-+++ linux-2.6.25.7.imq/net/sched/sch_generic.c 2008-06-17 14:56:58.000000000
+0300
-@@ -203,6 +203,7 @@
-
- clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
+ clear_bit(__QDISC_STATE_RUNNING, &q->state);
}
+EXPORT_SYMBOL(__qdisc_run);
static void dev_watchdog(unsigned long arg)
{
-only in patch2:
---- linux-2.6.27/drivers/net/imq.c.orig 2008-10-17 09:14:36.000000000
+0000
-+++ linux-2.6.27/drivers/net/imq.c 2008-10-20 09:06:40.000000000 +0000
-@@ -76,7 +76,7 @@
-
- struct imq_private {
- struct tasklet_struct tasklet;
-- int tasklet_pending;
-+ long tasklet_pending;
- };
-
- static nf_hookfn imq_nf_hook;
-@@ -219,8 +219,8 @@
- dev->stats.rx_bytes += entry->skb->len;
- dev->stats.rx_packets++;
-
-- spin_lock_bh(&dev->queue_lock);
-- q = dev->qdisc;
-+ netif_tx_lock_bh(dev);
-+ q = netdev_get_tx_queue(dev, queue_num)->qdisc;
- if (q->enqueue) {
- q->enqueue(skb_get(entry->skb), q);
- if (skb_shared(entry->skb)) {
-@@ -231,7 +231,7 @@
- }
- if (!test_and_set_bit(1, &priv->tasklet_pending))
- tasklet_schedule(&priv->tasklet);
-- spin_unlock_bh(&dev->queue_lock);
-+ netif_tx_unlock_bh(dev);
-
- if (skb2)
- kfree_skb(ret ? entry->skb : skb2);
-@@ -249,10 +249,10 @@
- struct net_device *dev = (struct net_device *)arg;
- struct imq_private *priv = netdev_priv(dev);
-
-- spin_lock(&dev->queue_lock);
-- qdisc_run(dev);
-+ netif_tx_lock(dev);
-+ qdisc_run(netdev_get_tx_queue(dev, 0)->qdisc);
- clear_bit(1, &priv->tasklet_pending);
-- spin_unlock(&dev->queue_lock);
-+ netif_tx_unlock(dev);
- }
-
- static unsigned int imq_nf_hook(unsigned int hook, struct sk_buff *pskb,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-imq.patch?r1=1.1.2.1.2.13&r2=1.1.2.1.2.13.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
