packages: kernel/kernel-imq.patch, kernel/kernel-multiarch.config, kernel/k...
arekm
arekm at pld-linux.org
Thu Jan 5 10:54:19 CET 2012
Author: arekm Date: Thu Jan 5 09:54:19 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- update for 3.2
---- Files affected:
packages/kernel:
kernel-imq.patch (1.14 -> 1.15) , kernel-multiarch.config (1.83 -> 1.84) , kernel-toshiba_acpi.patch (1.8 -> 1.9) , kernel-x86.config (1.39 -> 1.40) , kernel.spec (1.1009 -> 1.1010)
---- Diffs:
================================================================
Index: packages/kernel/kernel-imq.patch
diff -u packages/kernel/kernel-imq.patch:1.14 packages/kernel/kernel-imq.patch:1.15
--- packages/kernel/kernel-imq.patch:1.14 Sun Oct 30 07:33:37 2011
+++ packages/kernel/kernel-imq.patch Thu Jan 5 10:54:14 2012
@@ -1,7 +1,7 @@
-diff -uNr linux-3.0/drivers/net/imq.c linux-3.0-imq/drivers/net/imq.c
---- linux-3.0/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.0-imq/drivers/net/imq.c 2011-07-26 07:24:09.843279145 +0300
-@@ -0,0 +1,820 @@
+diff -uNr linux-3.1/drivers/net/imq.c linux-3.1-imq/drivers/net/imq.c
+--- linux-3.1/drivers/net/imq.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.1-imq/drivers/net/imq.c 2011-11-04 12:16:10.454992642 +0200
+@@ -0,0 +1,850 @@
+/*
+ * Pseudo-driver for the intermediate queue device.
+ *
@@ -114,6 +114,17 @@
+ * - Add queue mapping checks for packets exiting IMQ.
+ * - Port to 3.0
+ *
++ * 2011/08/16 - (Jussi Kivilinna)
++ * - Clear IFF_TX_SKB_SHARING flag that was added for linux 3.0.2
++ *
++ * 2011/11/03 - Germano Michel <germanomichel at gmail.com>
++ * - Fix IMQ for net namespaces
++ *
++ * 2011/11/04 - Jussi Kivilinna <jussi.kivilinna at mbnet.fi>
++ * - Port to 3.1
++ * - Clean-up, move 'get imq device pointer by imqX name' to
++ * separate function from imq_nf_queue().
++ *
+ * Also, many thanks to pablo Sebastian Greco for making the initial
+ * patch and to those who helped the testing.
+ *
@@ -466,6 +477,33 @@
+ return NETDEV_TX_OK;
+}
+
++static struct net_device *get_imq_device_by_index(int index)
++{
++ struct net_device *dev = NULL;
++ struct net *net;
++ char buf[8];
++
++ /* get device by name and cache result */
++ snprintf(buf, sizeof(buf), "imq%d", index);
++
++ /* Search device from all namespaces. */
++ for_each_net(net) {
++ dev = dev_get_by_name(net, buf);
++ if (dev)
++ break;
++ }
++
++ if (WARN_ON_ONCE(dev == NULL)) {
++ /* IMQ device not found. Exotic config? */
++ return ERR_PTR(-ENODEV);
++ }
++
++ imq_devs_cache[index] = dev;
++ dev_put(dev);
++
++ return dev;
++}
++
+static int imq_nf_queue(struct nf_queue_entry *entry, unsigned queue_num)
+{
+ struct net_device *dev;
@@ -490,20 +528,11 @@
+ /* check for imq device by index from cache */
+ dev = imq_devs_cache[index];
+ if (unlikely(!dev)) {
-+ char buf[8];
-+
-+ /* get device by name and cache result */
-+ snprintf(buf, sizeof(buf), "imq%d", index);
-+ dev = dev_get_by_name(&init_net, buf);
-+ if (unlikely(!dev)) {
-+ /* not found ?!*/
-+ BUG();
-+ retval = -ENODEV;
++ dev = get_imq_device_by_index(index);
++ if (IS_ERR(dev)) {
++ retval = PTR_ERR(dev);
+ goto out;
+ }
-+
-+ imq_devs_cache[index] = dev;
-+ dev_put(dev);
+ }
+
+ if (unlikely(!(dev->flags & IFF_UP))) {
@@ -636,14 +665,15 @@
+static void imq_setup(struct net_device *dev)
+{
+ dev->netdev_ops = &imq_netdev_ops;
-+ dev->type = ARPHRD_VOID;
-+ dev->mtu = 16000;
-+ dev->tx_queue_len = 11000;
-+ dev->flags = IFF_NOARP;
-+ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
++ dev->type = ARPHRD_VOID;
++ dev->mtu = 16000; /* too small? */
++ dev->tx_queue_len = 11000; /* too big? */
++ dev->flags = IFF_NOARP;
++ dev->features = NETIF_F_SG | NETIF_F_FRAGLIST |
+ NETIF_F_GSO | NETIF_F_HW_CSUM |
+ NETIF_F_HIGHDMA;
-+ dev->priv_flags &= ~IFF_XMIT_DST_RELEASE;
++ dev->priv_flags &= ~(IFF_XMIT_DST_RELEASE |
++ IFF_TX_SKB_SHARING);
+}
+
+static int imq_validate(struct nlattr *tb[], struct nlattr *data[])
@@ -822,9 +852,9 @@
+MODULE_LICENSE("GPL");
+MODULE_ALIAS_RTNL_LINK("imq");
+
-diff -uNr linux-3.0/drivers/net/Kconfig linux-3.0-imq/drivers/net/Kconfig
---- linux-3.0/drivers/net/Kconfig 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/drivers/net/Kconfig 2011-07-26 06:31:36.176747906 +0300
+diff -uNr linux-3.1/drivers/net/Kconfig linux-3.1-imq/drivers/net/Kconfig
+--- linux-3.1/drivers/net/Kconfig 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/drivers/net/Kconfig 2011-11-04 11:12:52.106390309 +0200
@@ -124,6 +124,125 @@
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@@ -951,20 +981,20 @@
config TUN
tristate "Universal TUN/TAP device driver support"
select CRC32
-diff -uNr linux-3.0/drivers/net/Makefile linux-3.0-imq/drivers/net/Makefile
---- linux-3.0/drivers/net/Makefile 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/drivers/net/Makefile 2011-07-24 12:06:25.922003276 +0300
-@@ -176,6 +176,7 @@
- obj-$(CONFIG_XEN_NETDEV_BACKEND) += xen-netback/
-
+diff -uNr linux-3.1/drivers/net/Makefile linux-3.1-imq/drivers/net/Makefile
+--- linux-3.1/drivers/net/Makefile 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/drivers/net/Makefile 2011-11-04 11:12:52.106390309 +0200
+@@ -7,6 +7,7 @@
+ #
+ obj-$(CONFIG_BONDING) += bonding/
obj-$(CONFIG_DUMMY) += dummy.o
+obj-$(CONFIG_IMQ) += imq.o
+ obj-$(CONFIG_EQUALIZER) += eql.o
obj-$(CONFIG_IFB) += ifb.o
obj-$(CONFIG_MACVLAN) += macvlan.o
- obj-$(CONFIG_MACVTAP) += macvtap.o
-diff -uNr linux-3.0/include/linux/imq.h linux-3.0-imq/include/linux/imq.h
---- linux-3.0/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.0-imq/include/linux/imq.h 2011-07-24 12:06:25.932003270 +0300
+diff -uNr linux-3.1/include/linux/imq.h linux-3.1-imq/include/linux/imq.h
+--- linux-3.1/include/linux/imq.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.1-imq/include/linux/imq.h 2011-11-04 11:12:52.109723710 +0200
@@ -0,0 +1,13 @@
+#ifndef _IMQ_H
+#define _IMQ_H
@@ -979,9 +1009,9 @@
+
+#endif /* _IMQ_H */
+
-diff -uNr linux-3.0/include/linux/netfilter/xt_IMQ.h linux-3.0-imq/include/linux/netfilter/xt_IMQ.h
---- linux-3.0/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.0-imq/include/linux/netfilter/xt_IMQ.h 2011-07-24 12:06:25.932003270 +0300
+diff -uNr linux-3.1/include/linux/netfilter/xt_IMQ.h linux-3.1-imq/include/linux/netfilter/xt_IMQ.h
+--- linux-3.1/include/linux/netfilter/xt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.1-imq/include/linux/netfilter/xt_IMQ.h 2011-11-04 11:12:52.109723710 +0200
@@ -0,0 +1,9 @@
+#ifndef _XT_IMQ_H
+#define _XT_IMQ_H
@@ -992,9 +1022,9 @@
+
+#endif /* _XT_IMQ_H */
+
-diff -uNr linux-3.0/include/linux/netfilter.h linux-3.0-imq/include/linux/netfilter.h
---- linux-3.0/include/linux/netfilter.h 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/include/linux/netfilter.h 2011-07-24 12:06:25.955336605 +0300
+diff -uNr linux-3.1/include/linux/netfilter.h linux-3.1-imq/include/linux/netfilter.h
+--- linux-3.1/include/linux/netfilter.h 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/include/linux/netfilter.h 2011-11-04 11:12:52.109723710 +0200
@@ -22,7 +22,8 @@
#define NF_QUEUE 3
#define NF_REPEAT 4
@@ -1005,9 +1035,9 @@
/* we overload the higher bits for encoding auxiliary data such as the queue
* number or errno values. Not nice, but better than additional function
-diff -uNr linux-3.0/include/linux/netfilter_ipv4/ipt_IMQ.h linux-3.0-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
---- linux-3.0/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.0-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2011-07-24 12:06:25.955336605 +0300
+diff -uNr linux-3.1/include/linux/netfilter_ipv4/ipt_IMQ.h linux-3.1-imq/include/linux/netfilter_ipv4/ipt_IMQ.h
+--- linux-3.1/include/linux/netfilter_ipv4/ipt_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.1-imq/include/linux/netfilter_ipv4/ipt_IMQ.h 2011-11-04 11:12:52.109723710 +0200
@@ -0,0 +1,10 @@
+#ifndef _IPT_IMQ_H
+#define _IPT_IMQ_H
@@ -1019,9 +1049,9 @@
+
+#endif /* _IPT_IMQ_H */
+
-diff -uNr linux-3.0/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-3.0-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
---- linux-3.0/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.0-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2011-07-24 12:06:25.955336605 +0300
+diff -uNr linux-3.1/include/linux/netfilter_ipv6/ip6t_IMQ.h linux-3.1-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h
+--- linux-3.1/include/linux/netfilter_ipv6/ip6t_IMQ.h 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.1-imq/include/linux/netfilter_ipv6/ip6t_IMQ.h 2011-11-04 11:12:52.113057113 +0200
@@ -0,0 +1,10 @@
+#ifndef _IP6T_IMQ_H
+#define _IP6T_IMQ_H
@@ -1033,20 +1063,20 @@
+
+#endif /* _IP6T_IMQ_H */
+
-diff -uNr linux-3.0/include/linux/skbuff.h linux-3.0-imq/include/linux/skbuff.h
---- linux-3.0/include/linux/skbuff.h 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/include/linux/skbuff.h 2011-07-24 12:06:25.968669945 +0300
+diff -uNr linux-3.1/include/linux/skbuff.h linux-3.1-imq/include/linux/skbuff.h
+--- linux-3.1/include/linux/skbuff.h 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/include/linux/skbuff.h 2011-11-04 11:12:52.116390515 +0200
@@ -29,6 +29,9 @@
- #include <linux/rcupdate.h>
#include <linux/dmaengine.h>
#include <linux/hrtimer.h>
+ #include <linux/dma-mapping.h>
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+#include <linux/imq.h>
+#endif
/* Don't change this without changing skb_csum_unnecessary! */
#define CHECKSUM_NONE 0
-@@ -339,6 +342,9 @@
+@@ -356,6 +359,9 @@
* first. This is owned by whoever has the skb queued ATM.
*/
char cb[48] __aligned(8);
@@ -1056,7 +1086,7 @@
unsigned long _skb_refdst;
#ifdef CONFIG_XFRM
-@@ -377,6 +383,9 @@
+@@ -394,6 +400,9 @@
#ifdef NET_SKBUFF_NF_DEFRAG_NEEDED
struct sk_buff *nfct_reasm;
#endif
@@ -1066,7 +1096,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
-@@ -401,6 +410,10 @@
+@@ -418,6 +427,10 @@
/* 0/13 bit hole */
@@ -1077,7 +1107,7 @@
#ifdef CONFIG_NET_DMA
dma_cookie_t dma_cookie;
#endif
-@@ -487,6 +500,12 @@
+@@ -504,6 +517,12 @@
return (struct rtable *)skb_dst(skb);
}
@@ -1090,7 +1120,7 @@
extern void kfree_skb(struct sk_buff *skb);
extern void consume_skb(struct sk_buff *skb);
extern void __kfree_skb(struct sk_buff *skb);
-@@ -2134,6 +2153,10 @@
+@@ -2157,6 +2176,10 @@
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@@ -1101,9 +1131,9 @@
#ifdef CONFIG_BRIDGE_NETFILTER
dst->nf_bridge = src->nf_bridge;
nf_bridge_get(src->nf_bridge);
-diff -uNr linux-3.0/include/net/netfilter/nf_queue.h linux-3.0-imq/include/net/netfilter/nf_queue.h
---- linux-3.0/include/net/netfilter/nf_queue.h 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/include/net/netfilter/nf_queue.h 2011-07-24 12:06:25.975336612 +0300
+diff -uNr linux-3.1/include/net/netfilter/nf_queue.h linux-3.1-imq/include/net/netfilter/nf_queue.h
+--- linux-3.1/include/net/netfilter/nf_queue.h 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/include/net/netfilter/nf_queue.h 2011-11-04 11:12:52.116390515 +0200
@@ -30,5 +30,11 @@
const struct nf_queue_handler *qh);
extern void nf_unregister_queue_handlers(const struct nf_queue_handler *qh);
@@ -1116,9 +1146,9 @@
+#endif
#endif /* _NF_QUEUE_H */
-diff -uNr linux-3.0/net/core/dev.c linux-3.0-imq/net/core/dev.c
---- linux-3.0/net/core/dev.c 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/core/dev.c 2011-07-26 07:52:00.513207402 +0300
+diff -uNr linux-3.1/net/core/dev.c linux-3.1-imq/net/core/dev.c
+--- linux-3.1/net/core/dev.c 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/core/dev.c 2011-11-04 11:12:52.119723915 +0200
@@ -98,6 +98,9 @@
#include <net/net_namespace.h>
#include <net/sock.h>
@@ -1129,7 +1159,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -2108,7 +2111,12 @@
+@@ -2126,7 +2129,12 @@
if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
skb_dst_drop(skb);
@@ -1142,9 +1172,9 @@
dev_queue_xmit_nit(skb, dev);
skb_orphan_try(skb);
-diff -uNr linux-3.0/net/core/skbuff.c linux-3.0-imq/net/core/skbuff.c
---- linux-3.0/net/core/skbuff.c 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/core/skbuff.c 2011-07-24 12:06:26.008669943 +0300
+diff -uNr linux-3.1/net/core/skbuff.c linux-3.1-imq/net/core/skbuff.c
+--- linux-3.1/net/core/skbuff.c 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/core/skbuff.c 2011-11-04 11:12:52.123057315 +0200
@@ -73,6 +73,9 @@
static struct kmem_cache *skbuff_head_cache __read_mostly;
@@ -1238,7 +1268,7 @@
/* Pipe buffer operations for a socket. */
static const struct pipe_buf_operations sock_pipe_buf_ops = {
-@@ -380,6 +459,26 @@
+@@ -392,6 +471,26 @@
WARN_ON(in_irq());
skb->destructor(skb);
}
@@ -1265,7 +1295,7 @@
#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
nf_conntrack_put(skb->nfct);
#endif
-@@ -518,6 +617,9 @@
+@@ -533,6 +632,9 @@
new->sp = secpath_get(old->sp);
#endif
memcpy(new->cb, old->cb, sizeof(old->cb));
@@ -1275,7 +1305,7 @@
new->csum = old->csum;
new->local_df = old->local_df;
new->pkt_type = old->pkt_type;
-@@ -2781,6 +2883,13 @@
+@@ -2888,6 +2990,13 @@
0,
SLAB_HWCACHE_ALIGN|SLAB_PANIC,
NULL);
@@ -1289,12 +1319,12 @@
}
/**
-diff -uNr linux-3.0/net/ipv6/ip6_output.c linux-3.0-imq/net/ipv6/ip6_output.c
---- linux-3.0/net/ipv6/ip6_output.c 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/ipv6/ip6_output.c 2011-07-24 16:46:04.789482257 +0300
-@@ -101,9 +101,6 @@
- struct dst_entry *dst = skb_dst(skb);
+diff -uNr linux-3.1/net/ipv6/ip6_output.c linux-3.1-imq/net/ipv6/ip6_output.c
+--- linux-3.1/net/ipv6/ip6_output.c 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/ipv6/ip6_output.c 2011-11-04 11:12:52.123057315 +0200
+@@ -102,9 +102,6 @@
struct net_device *dev = dst->dev;
+ struct neighbour *neigh;
- skb->protocol = htons(ETH_P_IPV6);
- skb->dev = dev;
@@ -1302,7 +1332,7 @@
if (ipv6_addr_is_multicast(&ipv6_hdr(skb)->daddr)) {
struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb));
-@@ -165,6 +162,11 @@
+@@ -170,6 +167,11 @@
return 0;
}
@@ -1314,9 +1344,9 @@
return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, skb, NULL, dev,
ip6_finish_output,
!(IP6CB(skb)->flags & IP6SKB_REROUTED));
-diff -uNr linux-3.0/net/netfilter/core.c linux-3.0-imq/net/netfilter/core.c
---- linux-3.0/net/netfilter/core.c 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/netfilter/core.c 2011-07-24 12:53:52.972141108 +0300
+diff -uNr linux-3.1/net/netfilter/core.c linux-3.1-imq/net/netfilter/core.c
+--- linux-3.1/net/netfilter/core.c 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/netfilter/core.c 2011-11-04 11:12:52.123057315 +0200
@@ -179,9 +179,11 @@
ret = NF_DROP_GETERR(verdict);
if (ret == 0)
@@ -1324,16 +1354,16 @@
- } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
+ } else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE ||
+ (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
- ret = nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
-- verdict >> NF_VERDICT_QBITS);
-+ verdict >> NF_VERDICT_QBITS,
-+ verdict & NF_VERDICT_MASK);
- if (ret < 0) {
- if (ret == -ECANCELED)
+ int err = nf_queue(skb, elem, pf, hook, indev, outdev, okfn,
+- verdict >> NF_VERDICT_QBITS);
++ verdict >> NF_VERDICT_QBITS,
++ verdict & NF_VERDICT_MASK);
+ if (err < 0) {
+ if (err == -ECANCELED)
goto next_hook;
-diff -uNr linux-3.0/net/netfilter/Kconfig linux-3.0-imq/net/netfilter/Kconfig
---- linux-3.0/net/netfilter/Kconfig 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/netfilter/Kconfig 2011-07-24 12:06:26.035336611 +0300
+diff -uNr linux-3.1/net/netfilter/Kconfig linux-3.1-imq/net/netfilter/Kconfig
+--- linux-3.1/net/netfilter/Kconfig 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/netfilter/Kconfig 2011-11-04 11:12:52.123057315 +0200
@@ -507,6 +507,18 @@
For more information on the LEDs available on your system, see
Documentation/leds-class.txt
@@ -1353,9 +1383,9 @@
config NETFILTER_XT_TARGET_MARK
tristate '"MARK" target support'
depends on NETFILTER_ADVANCED
-diff -uNr linux-3.0/net/netfilter/Makefile linux-3.0-imq/net/netfilter/Makefile
---- linux-3.0/net/netfilter/Makefile 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/netfilter/Makefile 2011-07-24 12:06:26.042003277 +0300
+diff -uNr linux-3.1/net/netfilter/Makefile linux-3.1-imq/net/netfilter/Makefile
+--- linux-3.1/net/netfilter/Makefile 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/netfilter/Makefile 2011-11-04 11:12:52.123057315 +0200
@@ -56,6 +56,7 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_CT) += xt_CT.o
obj-$(CONFIG_NETFILTER_XT_TARGET_DSCP) += xt_DSCP.o
@@ -1364,9 +1394,9 @@
obj-$(CONFIG_NETFILTER_XT_TARGET_LED) += xt_LED.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NFLOG) += xt_NFLOG.o
obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE) += xt_NFQUEUE.o
-diff -uNr linux-3.0/net/netfilter/nf_internals.h linux-3.0-imq/net/netfilter/nf_internals.h
---- linux-3.0/net/netfilter/nf_internals.h 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/netfilter/nf_internals.h 2011-07-24 12:54:17.615475634 +0300
+diff -uNr linux-3.1/net/netfilter/nf_internals.h linux-3.1-imq/net/netfilter/nf_internals.h
+--- linux-3.1/net/netfilter/nf_internals.h 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/netfilter/nf_internals.h 2011-11-04 11:12:52.123057315 +0200
@@ -29,7 +29,7 @@
struct net_device *indev,
struct net_device *outdev,
@@ -1376,9 +1406,9 @@
extern int __init netfilter_queue_init(void);
/* nf_log.c */
-diff -uNr linux-3.0/net/netfilter/nf_queue.c linux-3.0-imq/net/netfilter/nf_queue.c
---- linux-3.0/net/netfilter/nf_queue.c 2011-07-22 05:17:23.000000000 +0300
-+++ linux-3.0-imq/net/netfilter/nf_queue.c 2011-07-24 13:05:00.682173434 +0300
+diff -uNr linux-3.1/net/netfilter/nf_queue.c linux-3.1-imq/net/netfilter/nf_queue.c
+--- linux-3.1/net/netfilter/nf_queue.c 2011-10-24 10:10:05.000000000 +0300
++++ linux-3.1-imq/net/netfilter/nf_queue.c 2011-11-04 11:12:52.123057315 +0200
@@ -22,6 +22,26 @@
static DEFINE_MUTEX(queue_handler_mutex);
@@ -1493,9 +1523,9 @@
if (err < 0) {
if (err == -ECANCELED)
goto next_hook;
-diff -uNr linux-3.0/net/netfilter/xt_IMQ.c linux-3.0-imq/net/netfilter/xt_IMQ.c
---- linux-3.0/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
-+++ linux-3.0-imq/net/netfilter/xt_IMQ.c 2011-07-24 12:06:26.062003279 +0300
+diff -uNr linux-3.1/net/netfilter/xt_IMQ.c linux-3.1-imq/net/netfilter/xt_IMQ.c
+--- linux-3.1/net/netfilter/xt_IMQ.c 1970-01-01 02:00:00.000000000 +0200
++++ linux-3.1-imq/net/netfilter/xt_IMQ.c 2011-11-04 11:12:52.123057315 +0200
@@ -0,0 +1,74 @@
+/*
+ * This target marks packets to be enqueued to an imq device
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.83 packages/kernel/kernel-multiarch.config:1.84
--- packages/kernel/kernel-multiarch.config:1.83 Tue Dec 13 16:08:45 2011
+++ packages/kernel/kernel-multiarch.config Thu Jan 5 10:54:14 2012
@@ -17,6 +17,7 @@
PHYSICAL_START all=0x1000000
PROCESSOR_SELECT all=y
RAPIDIO all=y
+X86_X2APIC all=y
#-
#- *** FILE: block/Kconfig ***
@@ -53,6 +54,7 @@
CRYPTO_BLKCIPHER all=m
CRYPTO_HASH all=y
CRYPTO_MANAGER all=y
+CRYPTO_USER all=m
CRYPTO_MANAGER_DISABLE_TESTS all=y
CRYPTO_GF128MUL all=m
CRYPTO_NULL all=m
@@ -88,6 +90,7 @@
CRYPTO_RMD256 all=m
CRYPTO_RMD320 all=m
CRYPTO_SHA1 all=y
+CRYPTO_SHA1_SSSE3 all=m
CRYPTO_SHA256 all=y
CRYPTO_SHA512 all=m
CRYPTO_TGR192 all=m
@@ -101,6 +104,7 @@
CRYPTO_ANUBIS all=m
CRYPTO_ARC4 all=m
CRYPTO_BLOWFISH all=m
+CRYPTO_BLOWFISH_X86_64 all=m
CRYPTO_CAMELLIA all=m
CRYPTO_CAST5 all=m
CRYPTO_CAST6 all=m
@@ -117,6 +121,7 @@
CRYPTO_TWOFISH_COMMON all=m
CRYPTO_TWOFISH_586 i386=m
CRYPTO_TWOFISH_X86_64 x86_64=m
+CRYPTO_TWOFISH_X86_64_3WAY all=m
#- Compression
CRYPTO_DEFLATE all=m
CRYPTO_ZLIB all=m
@@ -587,6 +592,17 @@
CRYPTO_DEV_TALITOS all=m
#-
+#- *** FILE: drivers/devfreq/Kconfig ***
+#-
+PM_DEVFREQ all=y
+#- DEVFREQ Governors
+DEVFREQ_GOV_SIMPLE_ONDEMAND all=y
+DEVFREQ_GOV_PERFORMANCE all=y
+DEVFREQ_GOV_POWERSAVE all=y
+DEVFREQ_GOV_USERSPACE all=y
+#- DEVFREQ Drivers
+
+#-
#- *** FILE: drivers/dma/Kconfig ***
#-
DMADEVICES all=y
@@ -629,6 +645,7 @@
EDAC_I5000 i386=m x86_64=m
EDAC_I5100 i386=m x86_64=m
EDAC_I7300 all=m
+EDAC_SBRIDGE all=m
EDAC_PASEMI ppc64=m
EDAC_CELL ppc64=m
EDAC_AMD8131 powerpc=m
@@ -731,6 +748,8 @@
DRM_SIS all=m
DRM_VIA all=m
DRM_SAVAGE all=m
+#- file drivers/gpu/drm/exynos/Kconfig goes here
+#- file drivers/gpu/drm/vmwgfx/Kconfig goes here
#-
#- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
@@ -795,10 +814,11 @@
HID_KENSINGTON all=m
HID_LCPOWER all=m
HID_LOGITECH all=m
+HID_LOGITECH_DJ all=m
LOGITECH_FF all=y
LOGIRUMBLEPAD2_FF all=y
LOGIG940_FF all=y
-LOGIWII_FF all=y
+LOGIWHEELS_FF all=y
HID_MAGICMOUSE all=m
HID_MICROSOFT all=m
HID_MONTEREY all=m
@@ -813,6 +833,7 @@
HID_PICOLCD_BACKLIGHT all=y
HID_PICOLCD_LCD all=y
HID_PICOLCD_LEDS all=y
+HID_PRIMAX all=m
HID_QUANTA all=m
HID_ROCCAT all=m
HID_ROCCAT_COMMON all=m
@@ -851,6 +872,12 @@
USB_MOUSE all=n
#-
+#- *** FILE: drivers/hv/Kconfig ***
+#-
+HYPERV all=m
+HYPERV_UTILS all=m
+
+#-
#- *** FILE: drivers/hwmon/Kconfig ***
#-
HWMON all=m
@@ -859,6 +886,7 @@
#- Native drivers
SENSORS_ABITUGURU all=m
SENSORS_ABITUGURU3 all=m
+SENSORS_AD7314 all=m
SENSORS_AD7414 all=m
SENSORS_AD7418 all=m
SENSORS_ADCXX all=m
@@ -977,11 +1005,13 @@
SENSORS_PMBUS all=m
SENSORS_ADM1275 all=m
SENSORS_LM25066 all=m
+SENSORS_LTC2978 all=m
SENSORS_MAX16064 all=m
SENSORS_MAX34440 all=m
SENSORS_MAX8688 all=m
SENSORS_UCD9000 all=m
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.14&r2=1.15&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.83&r2=1.84&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-toshiba_acpi.patch?r1=1.8&r2=1.9&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.39&r2=1.40&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.1009&r2=1.1010&f=u
More information about the pld-cvs-commit
mailing list