* [net-2.6 PATCH 1/3] net: dcb: match dcb_app protocol field with 802.1Qaz spec
From: John Fastabend @ 2011-01-31 22:00 UTC (permalink / raw)
To: davem; +Cc: john.r.fastabend, netdev
The dcb_app protocol field is a __u32 however the 802.1Qaz
specification defines it as a 16 bit field. This patch brings
the structure inline with the spec making it a __u16.
Signed-off-by: John Fastabend <john.r.fastabend@intel.com>
---
include/linux/dcbnl.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/linux/dcbnl.h b/include/linux/dcbnl.h
index 68cd248..bdc7ef4 100644
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
@@ -101,7 +101,7 @@ struct ieee_pfc {
*/
struct dcb_app {
__u8 selector;
- __u32 protocol;
+ __u16 protocol;
__u8 priority;
};
^ permalink raw reply related
* Re: patch "appletalk: move to staging" added to staging tree
From: David Miller @ 2011-01-31 22:05 UTC (permalink / raw)
To: arnd; +Cc: gregkh, acme, netdev
In-Reply-To: <201101312255.39981.arnd@arndb.de>
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 31 Jan 2011 22:55:39 +0100
> On Monday 31 January 2011, gregkh@suse.de wrote:
>>
>> This is a note to let you know that I've just added the patch titled
>>
>> appletalk: move to staging
>>
>> to my staging git tree which can be found at
>> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
>> in the staging-next branch.
>
> Actually, David Miller objected to this patch for good reasons, please
> revert it. One of the other patches removes the BKL in appletalk, so
> we should find a way to keep it.
Right.
^ permalink raw reply
* Re: [PATCH] Make INET_LHTABLE_SIZE a compile-time tunable
From: David Miller @ 2011-01-31 22:05 UTC (permalink / raw)
To: wsommerfeld; +Cc: netdev, therbert
In-Reply-To: <AANLkTi=5ncH6aRY5ifA0TONB7L5RDdHkriMY1p=aDxs6@mail.gmail.com>
From: Bill Sommerfeld <wsommerfeld@google.com>
Date: Mon, 31 Jan 2011 13:52:03 -0800
> On Fri, Jan 14, 2011 at 13:48, I wrote:
>> INET_LHTABLE_SIZE has been fixed at 32 for a long time. It should be
>> tunable as larger systems may be running many more than 32 listeners.
>
> I haven't seen any responses to this patch submission. Can someone
> take a look? Thanks.
It should be dynamically sized. Compile time configuration knobs
generally stick.
^ permalink raw reply
* Re: patch "appletalk: move to staging" added to staging tree
From: Greg KH @ 2011-01-31 22:02 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: acme, netdev, David Miller
In-Reply-To: <201101312255.39981.arnd@arndb.de>
On Mon, Jan 31, 2011 at 10:55:39PM +0100, Arnd Bergmann wrote:
> On Monday 31 January 2011, gregkh@suse.de wrote:
> >
> > This is a note to let you know that I've just added the patch titled
> >
> > appletalk: move to staging
> >
> > to my staging git tree which can be found at
> > git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
> > in the staging-next branch.
>
> Actually, David Miller objected to this patch for good reasons, please
> revert it. One of the other patches removes the BKL in appletalk, so
> we should find a way to keep it.
Oops, sorry about that, I'll go revert it.
greg k-h
^ permalink raw reply
* Re: patch "appletalk: move to staging" added to staging tree
From: Arnd Bergmann @ 2011-01-31 21:55 UTC (permalink / raw)
To: gregkh; +Cc: acme, netdev, David Miller
In-Reply-To: <12965099622238@site>
On Monday 31 January 2011, gregkh@suse.de wrote:
>
> This is a note to let you know that I've just added the patch titled
>
> appletalk: move to staging
>
> to my staging git tree which can be found at
> git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git
> in the staging-next branch.
Actually, David Miller objected to this patch for good reasons, please
revert it. One of the other patches removes the BKL in appletalk, so
we should find a way to keep it.
Arnd
^ permalink raw reply
* Re: [PATCH v2 16/16] skge: convert to hw_features
From: Michał Mirosław @ 2011-01-31 21:53 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev, Ben Hutchings
In-Reply-To: <20110131084502.7be146e7@nehalam>
On Mon, Jan 31, 2011 at 08:45:02AM -0800, Stephen Hemminger wrote:
> On Sat, 22 Jan 2011 23:14:14 +0100 (CET)
> Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
> > The hardware might do full HW_CSUM, not just IP_CSUM, but it's not tested
> > and so not changed here.
> > Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
> The skge hardware does not do full HW_CSUM. It looks at the IP header.
Driver code suggests otherwise. Please look at skge_xmit_frame() and TX
descriptor format.
Besides, I'm locally using a patch that makes skge advertise HW_CSUM - TCP
over IPv6 is correctly checksummed in hardware (haven't tried VLANs yet).
Best Regards,
Michał Mirosław
^ permalink raw reply
* Re: [PATCH] Make INET_LHTABLE_SIZE a compile-time tunable
From: Bill Sommerfeld @ 2011-01-31 21:52 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Tom Herbert, Bill Sommerfeld
In-Reply-To: <1295041688-16550-1-git-send-email-wsommerfeld@google.com>
On Fri, Jan 14, 2011 at 13:48, I wrote:
> INET_LHTABLE_SIZE has been fixed at 32 for a long time. It should be
> tunable as larger systems may be running many more than 32 listeners.
I haven't seen any responses to this patch submission. Can someone
take a look? Thanks.
- Bill
^ permalink raw reply
* Re: pull request: batman-adv 2011-01-31
From: David Miller @ 2011-01-31 21:26 UTC (permalink / raw)
To: sven; +Cc: netdev
In-Reply-To: <1296487251-12552-1-git-send-email-sven@narfation.org>
From: Sven Eckelmann <sven@narfation.org>
Date: Mon, 31 Jan 2011 16:20:42 +0100
> Hi,
>
> I would like to propose some changes for net-next-2.6.git. These include two
> bugfixes for the fragmentation handling which were not accepted in net-2.6. The
> last seven changes are only cleanups and non-functionality changes.
>
> No included change has any hard dependencies to the oops fixes which were
> pulled by you into net-2.6 yesterday.
>
> thanks,
> Sven
>
> The following changes since commit 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5:
>
> Linux 2.6.38-rc2 (2011-01-21 19:01:34 -0800)
>
> are available in the git repository at:
> git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next
Pulled, thanks Sven.
^ permalink raw reply
* Re: [PATCH net-next 0/10] bnx2x: Few enhancements and styling fixes
From: David Miller @ 2011-01-31 21:24 UTC (permalink / raw)
To: yanivr; +Cc: netdev, eilong
In-Reply-To: <1296483683.17181.110.camel@lb-tlvb-dmitry>
From: "Yaniv Rosner" <yanivr@broadcom.com>
Date: Mon, 31 Jan 2011 16:21:23 +0200
> The following patch series describe some link enhancements and styling fixes in bnx2x driver.
> It should not cause conflicts when integrating the net-2.6.
How can it not cause conflicts, when there is a driver version update
in yesterday's net-2.6 patch set as well as this one.
> Please consider applying it to net-next.
I've applied this series to net-next-2.6, resolving the version conflict by
hand.
^ permalink raw reply
* Re: [PATCH] CAN: softing driver depends on IOMEM
From: David Miller @ 2011-01-31 21:20 UTC (permalink / raw)
To: kurt.van.dijck; +Cc: cebbert, netdev
In-Reply-To: <20110131160334.GC334@e-circ.dyndns.org>
From: Kurt Van Dijck <kurt.van.dijck@eia.be>
Date: Mon, 31 Jan 2011 17:03:34 +0100
> On Mon, Jan 31, 2011 at 10:44:07AM -0500, Chuck Ebbert wrote:
>> CAN: softing driver depends on IOMEM
> Acked-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Applied, thanks.
^ permalink raw reply
* Re: linux-next: Tree for January 31 (ip_vs)
From: Simon Horman @ 2011-01-31 21:18 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, netdev, linux-next, LKML
In-Reply-To: <20110131101829.b842da44.randy.dunlap@oracle.com>
On Mon, Jan 31, 2011 at 10:18:29AM -0800, Randy Dunlap wrote:
> On Mon, 31 Jan 2011 17:41:13 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20110121:
> >
> > The net tree lost its build failure.
>
>
> When CONFIG_SYSCTL is not enabled:
>
> net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
> ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
> ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
Thanks, I'm looking into it.
^ permalink raw reply
* Re: [PATCH] Add default_mtu() methods to blackhole dst_ops
From: David Miller @ 2011-01-31 21:15 UTC (permalink / raw)
To: roland; +Cc: netdev
In-Reply-To: <87fws8zsit.fsf@shaolin.home.digitalvampire.org>
From: Roland Dreier <roland@digitalvampire.org>
Date: Mon, 31 Jan 2011 13:12:58 -0800
> From: Roland Dreier <roland@purestorage.com>
>
> When an IPSEC SA is still being set up, __xfrm_lookup() will return
> -EREMOTE and so ip_route_output_flow() will return a blackhole route.
> This can happen in a sndmsg call, and after d33e455337ea ("net: Abstract
> default MTU metric calculation behind an accessor.") this leads to a
> crash in ip_append_data() because the blackhole dst_ops have no
> default_mtu() method and so dst_mtu() calls a NULL pointer.
>
> Fix this by adding default_mtu() methods (that simply return 0, matching
> the old behavior) to the blackhole dst_ops.
>
> The IPv4 part of this patch fixes a crash that I saw when using an IPSEC
> VPN; the IPv6 part is untested because I don't have an IPv6 VPN, but it
> looks to be needed as well.
>
> Signed-off-by: Roland Dreier <roland@purestorage.com>
Thanks so much for tracking this down and fixing it. I was going to look
at your traces and report later today.
I'll apply this, thanks again Roland.
^ permalink raw reply
* Re: IAMT broken by commit 82776a4bcd7aa5fbcd2e6339b3ce88b727dd40ab
From: David Miller @ 2011-01-31 20:36 UTC (permalink / raw)
To: aurelien; +Cc: bruce.w.allan, jeffrey.t.kirsher, netdev
In-Reply-To: <20110131114558.GA28303@volta.aurel32.net>
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 31 Jan 2011 12:45:58 +0100
>> On recent kernels, IAMT support does not work after the machine has
>> been powered-off. Even worse, it also goes into this state when I try
>> to reboot it.
>>
>> I have done a bisect and got this commit:
>>
>> | commit 82776a4bcd7aa5fbcd2e6339b3ce88b727dd40ab
>> | Author: Bruce Allan <bruce.w.allan@intel.com>
>> | Date: Fri Aug 14 14:35:33 2009 +0000
>> |
>> | e1000e: WoL does not work on 82577/82578 with manageability enabled
>> |
>> | With manageability (Intel AMT) enabled via BIOS, PHY wakeup does not get
>> | configured on newer parts which use PHY wakeup vs. MAC wakeup which causes
>> | WoL to not work. The driver should configure PHY wakeup whether or not
>> | manageability is enabled.
>> |
>> | Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
>> | Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>> | Signed-off-by: David S. Miller <davem@davemloft.net>
>>
>> I have tried to revert it on recent kernels (2.6.34), and IAMT is then
>> working as expected. My machine is using a Gigabyte EQ45M-S2 motherboard
>> with an 82567LM-3 ethernet chip (8086:10de), that is a different model
>> than the one of the original problem.
>>
>> I do wonder if the changes in the patch should not only be done on some
>> chip models, and I will appreciate any help in fixing this issue.
>>
>
> Just a short mail to say this problem is still present in 2.6.38-rc2.
> The same solution still applies, that is reverting the above commit.
> Note that reverting the first hunk only is enough to get it working
> again.
Intel folks please look into this.
^ permalink raw reply
* Re: [PATCH 0/7] netfilter: netfilter update for -next
From: David Miller @ 2011-01-31 20:32 UTC (permalink / raw)
To: kaber; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: kaber@trash.net
Date: Mon, 31 Jan 2011 21:10:13 +0100
> following is a small netfilter update for net-next, containing:
>
> - compiler warning fixes for IPVS from Changli
>
> - IPVS netns fixes from Simon and Hans Schillstrom
>
> - a fix for connlimit destination address selection in NAT scenarios,
> from Jan
>
> - minor iprange bugfixes and debugging improvements from Thomas Jacob
>
> Please pull from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git master
Pulled, thanks Patrick.
^ permalink raw reply
* [PATCH 6/7] netfilter: xt_iprange: typo in IPv4 match debug print code
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Thomas Jacob <jacob@internet24.de>
Signed-off-by: Thomas Jacob <jacob@internet24.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/xt_iprange.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/xt_iprange.c b/net/netfilter/xt_iprange.c
index 88f7c35..77b9ebc 100644
--- a/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@ -31,7 +31,7 @@ iprange_mt4(const struct sk_buff *skb, struct xt_action_param *par)
pr_debug("src IP %pI4 NOT in range %s%pI4-%pI4\n",
&iph->saddr,
(info->flags & IPRANGE_SRC_INV) ? "(INV) " : "",
- &info->src_max.ip,
+ &info->src_min.ip,
&info->src_max.ip);
return false;
}
--
1.7.2.3
^ permalink raw reply related
* [PATCH 5/7] netfilter: xt_connlimit: pick right dstaddr in NAT scenario
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Jan Engelhardt <jengelh@medozas.de>
xt_connlimit normally records the "original" tuples in a hashlist
(such as "1.2.3.4 -> 5.6.7.8"), and looks in this list for iph->daddr
when counting.
When the user however uses DNAT in PREROUTING, looking for
iph->daddr -- which is now 192.168.9.10 -- will not match. Thus in
daddr mode, we need to record the reverse direction tuple
("192.168.9.10 -> 1.2.3.4") instead. In the reverse tuple, the dst
addr is on the src side, which is convenient, as count_them still uses
&conn->tuple.src.u3.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
net/netfilter/xt_connlimit.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/net/netfilter/xt_connlimit.c b/net/netfilter/xt_connlimit.c
index 7fd3fd5..e029c48 100644
--- a/net/netfilter/xt_connlimit.c
+++ b/net/netfilter/xt_connlimit.c
@@ -185,11 +185,15 @@ connlimit_mt(const struct sk_buff *skb, struct xt_action_param *par)
int connections;
ct = nf_ct_get(skb, &ctinfo);
- if (ct != NULL)
- tuple_ptr = &ct->tuplehash[0].tuple;
- else if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
- par->family, &tuple))
+ if (ct != NULL) {
+ if (info->flags & XT_CONNLIMIT_DADDR)
+ tuple_ptr = &ct->tuplehash[IP_CT_DIR_REPLY].tuple;
+ else
+ tuple_ptr = &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple;
+ } else if (!nf_ct_get_tuplepr(skb, skb_network_offset(skb),
+ par->family, &tuple)) {
goto hotdrop;
+ }
if (par->family == NFPROTO_IPV6) {
const struct ipv6hdr *iph = ipv6_hdr(skb);
--
1.7.2.3
^ permalink raw reply related
* [PATCH 4/7] netfilter: ipvs: fix compiler warnings
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Changli Gao <xiaosuo@gmail.com>
Fix compiler warnings when IP_VS_DBG() isn't defined.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Acked-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_core.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index f36a84f..d889f4f 100644
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1894,9 +1894,7 @@ static int __net_init __ip_vs_init(struct net *net)
static void __net_exit __ip_vs_cleanup(struct net *net)
{
- struct netns_ipvs *ipvs = net_ipvs(net);
-
- IP_VS_DBG(10, "ipvs netns %d released\n", ipvs->gen);
+ IP_VS_DBG(10, "ipvs netns %d released\n", net_ipvs(net)->gen);
}
static struct pernet_operations ipvs_core_ops = {
--
1.7.2.3
^ permalink raw reply related
* [PATCH 0/7] netfilter: netfilter update for -next
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
following is a small netfilter update for net-next, containing:
- compiler warning fixes for IPVS from Changli
- IPVS netns fixes from Simon and Hans Schillstrom
- a fix for connlimit destination address selection in NAT scenarios,
from Jan
- minor iprange bugfixes and debugging improvements from Thomas Jacob
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6.git master
Thanks!
^ permalink raw reply
* [PATCH 1/7] netfilter: ipvs: fix compiler warnings
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Changli Gao <xiaosuo@gmail.com>
Fix compiler warnings when no transport protocol load balancing support
is configured.
[horms@verge.net.au: removed suprious __ip_vs_cleanup() clean-up hunk]
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_ctl.c | 4 ++++
net/netfilter/ipvs/ip_vs_proto.c | 4 ++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 09ca2ce..68b8033 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -2062,7 +2062,9 @@ static const struct file_operations ip_vs_stats_percpu_fops = {
*/
static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u)
{
+#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)
struct ip_vs_proto_data *pd;
+#endif
IP_VS_DBG(2, "Setting timeout tcp:%d tcpfin:%d udp:%d\n",
u->tcp_timeout,
@@ -2405,7 +2407,9 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
static inline void
__ip_vs_get_timeouts(struct net *net, struct ip_vs_timeout_user *u)
{
+#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)
struct ip_vs_proto_data *pd;
+#endif
#ifdef CONFIG_IP_VS_PROTO_TCP
pd = ip_vs_proto_data_get(net, IPPROTO_TCP);
diff --git a/net/netfilter/ipvs/ip_vs_proto.c b/net/netfilter/ipvs/ip_vs_proto.c
index 6ac986c..17484a4 100644
--- a/net/netfilter/ipvs/ip_vs_proto.c
+++ b/net/netfilter/ipvs/ip_vs_proto.c
@@ -60,6 +60,9 @@ static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp)
return 0;
}
+#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP) || \
+ defined(CONFIG_IP_VS_PROTO_SCTP) || defined(CONFIG_IP_VS_PROTO_AH) || \
+ defined(CONFIG_IP_VS_PROTO_ESP)
/*
* register an ipvs protocols netns related data
*/
@@ -85,6 +88,7 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp)
return 0;
}
+#endif
/*
* unregister an ipvs protocol
--
1.7.2.3
^ permalink raw reply related
* [PATCH 7/7] netfilter: xt_iprange: add IPv6 match debug print code
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Thomas Jacob <jacob@internet24.de>
Signed-off-by: Thomas Jacob <jacob@internet24.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
---
net/netfilter/xt_iprange.c | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/xt_iprange.c b/net/netfilter/xt_iprange.c
index 77b9ebc..d3eb5ed 100644
--- a/net/netfilter/xt_iprange.c
+++ b/net/netfilter/xt_iprange.c
@@ -78,15 +78,27 @@ iprange_mt6(const struct sk_buff *skb, struct xt_action_param *par)
m = iprange_ipv6_sub(&iph->saddr, &info->src_min.in6) < 0;
m |= iprange_ipv6_sub(&iph->saddr, &info->src_max.in6) > 0;
m ^= !!(info->flags & IPRANGE_SRC_INV);
- if (m)
+ if (m) {
+ pr_debug("src IP %pI6 NOT in range %s%pI6-%pI6\n",
+ &iph->saddr,
+ (info->flags & IPRANGE_SRC_INV) ? "(INV) " : "",
+ &info->src_min.in6,
+ &info->src_max.in6);
return false;
+ }
}
if (info->flags & IPRANGE_DST) {
m = iprange_ipv6_sub(&iph->daddr, &info->dst_min.in6) < 0;
m |= iprange_ipv6_sub(&iph->daddr, &info->dst_max.in6) > 0;
m ^= !!(info->flags & IPRANGE_DST_INV);
- if (m)
+ if (m) {
+ pr_debug("dst IP %pI6 NOT in range %s%pI6-%pI6\n",
+ &iph->daddr,
+ (info->flags & IPRANGE_DST_INV) ? "(INV) " : "",
+ &info->dst_min.in6,
+ &info->dst_max.in6);
return false;
+ }
}
return true;
}
--
1.7.2.3
^ permalink raw reply related
* [PATCH 3/7] IPVS netns BUG, register sysctl for root ns
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Hans Schillstrom <hans.schillstrom@ericsson.com>
The newly created table was not used when register sysctl for a new namespace.
I.e. sysctl doesn't work for other than root namespace (init_net)
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_ctl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index 68b8033..98df59a 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3556,7 +3556,7 @@ int __net_init __ip_vs_control_init(struct net *net)
ipvs->sysctl_hdr = register_net_sysctl_table(net, net_vs_ctl_path,
- vs_vars);
+ tbl);
if (ipvs->sysctl_hdr == NULL)
goto err_reg;
ip_vs_new_estimator(net, ipvs->tot_stats);
--
1.7.2.3
^ permalink raw reply related
* [PATCH 2/7] IPVS: Change sock_create_kernel() to __sock_create()
From: kaber @ 2011-01-31 20:10 UTC (permalink / raw)
To: davem; +Cc: netfilter-devel, netdev
In-Reply-To: <1296504620-820-1-git-send-email-kaber@trash.net>
From: Simon Horman <horms@verge.net.au>
The recent netns changes omitted to change
sock_create_kernel() to __sock_create() in ip_vs_sync.c
The effect of this is that the interface will be selected in the
root-namespace, from my point of view it's a major bug.
Reported-by: Hans Schillstrom <hans@schillstrom.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
net/netfilter/ipvs/ip_vs_sync.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index d1adf98..d5a6e64 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -1305,7 +1305,7 @@ static struct socket *make_send_sock(struct net *net)
int result;
/* First create a socket */
- result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);
+ result = __sock_create(net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
if (result < 0) {
pr_err("Error during creation of socket; terminating\n");
return ERR_PTR(result);
@@ -1351,7 +1351,7 @@ static struct socket *make_receive_sock(struct net *net)
int result;
/* First create a socket */
- result = sock_create_kern(PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock);
+ result = __sock_create(net, PF_INET, SOCK_DGRAM, IPPROTO_UDP, &sock, 1);
if (result < 0) {
pr_err("Error during creation of socket; terminating\n");
return ERR_PTR(result);
--
1.7.2.3
^ permalink raw reply related
* Re: [PATCH 1/1] compat-wireless: Fix ath9k debug log issue.
From: Joe Perches @ 2011-01-31 18:58 UTC (permalink / raw)
To: Senthil Balasubramanian
Cc: luis.rodriguez-DlyHzToyqoxBDgjK7y7TUQ,
mcgrof-Re5JQEeQqe8AvxtiuMwx3w,
linux-wireless-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA
In-Reply-To: <1296473865-18529-1-git-send-email-senthilkumar-DlyHzToyqoxBDgjK7y7TUQ@public.gmane.org>
On Mon, 2011-01-31 at 17:07 +0530, Senthil Balasubramanian wrote:
> ath9k debug logs are not shown as we are using recursive vsnprintf
> which are supported in kernel 2.6.36 and above. use vprintk for older
> kernels.
#ifdefs spread around the tree for this sort of
change are not very nice.
Perhaps wireless-compat should not be an impediment to
mainline progress and these sorts of changes should be
minimized.
If this is really necessary for backward compatibility,
I think the %pV could just be removed.
If not, because this style would be used in several
places, perhaps another macro could be used to hide the
use of %pV.
Maybe something like:
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
#define PRINTK_VA_LIST(level, prefix, fmt, __va_list) \
({ \
struct va_format vaf; \
\
vaf.fmt = fmt; \
vaf.va = &__va_list; \
\
printk("%s" prefix "%pV", level, &vaf); \
})
#else
#define PRINTK_VA_LIST(level, prefix, fmt, __va_list) \
({ \
printk("%s" prefix, level); \
vprintk(fmt, __va_list); \
})
#endif
> +diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
> +index c325202..e3e60d4 100644
> +--- a/drivers/net/wireless/ath/main.c
> ++++ b/drivers/net/wireless/ath/main.c
> +@@ -60,16 +60,23 @@ EXPORT_SYMBOL(ath_rxbuf_alloc);
> + int ath_printk(const char *level, struct ath_common *common,
> + const char *fmt, ...)
> + {
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
> + struct va_format vaf;
> ++#endif
> + va_list args;
> + int rtn;
> +
> + va_start(args, fmt);
> +
> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))
> + vaf.fmt = fmt;
> + vaf.va = &args;
> +
> + rtn = printk("%sath: %pV", level, &vaf);
> ++#else
> ++ printk("%sath: ", level);
> ++ rtn = vprintk(fmt, args);
> ++#endif
> +
> + va_end(args);
> +
So this would become something like:
int ath_printk(const char *level, struct ath_common *common,
const char *fmt, ...)
{
va_list args;
int rtn;
va_start(args, fmt);
rtn = PRINTK_VA_LIST(level, "ath: ", fmt, args);
va_end(args);
return rtn;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply
* Re: linux-next: Tree for January 31 (ip_vs)
From: Randy Dunlap @ 2011-01-31 18:18 UTC (permalink / raw)
To: Stephen Rothwell, netdev; +Cc: linux-next, LKML
In-Reply-To: <20110131174113.8199f901.sfr@canb.auug.org.au>
On Mon, 31 Jan 2011 17:41:13 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110121:
>
> The net tree lost its build failure.
When CONFIG_SYSCTL is not enabled:
net/netfilter/ipvs/ip_vs_core.c:1891: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'unsigned int'
ERROR: "unregister_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
ERROR: "register_net_sysctl_table" [net/netfilter/ipvs/ip_vs.ko] undefined!
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: [PATCH v2 16/16] skge: convert to hw_features
From: Stephen Hemminger @ 2011-01-31 16:45 UTC (permalink / raw)
To: Michał Mirosław; +Cc: netdev, Ben Hutchings
In-Reply-To: <34b51af1d2b880439d2d210837fc87a89c0b9ec4.1295734271.git.mirq-linux@rere.qmqm.pl>
On Sat, 22 Jan 2011 23:14:14 +0100 (CET)
Michał Mirosław <mirq-linux@rere.qmqm.pl> wrote:
> The hardware might do full HW_CSUM, not just IP_CSUM, but it's not tested
> and so not changed here.
>
> Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
The skge hardware does not do full HW_CSUM. It looks at the IP header.
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox