* Re: [BUG] znet.c sleeping function called from invalid context
From: Mike Frysinger @ 2009-10-07 18:44 UTC (permalink / raw)
To: Michael Hennerich
Cc: netdev-u79uwXL29TY76Z2rM5mHXA, Alexander Strakh, David S. Miller,
uclinux-dist-devel, Linux Kernlel Mailing List
In-Reply-To: <200910071847.38163.strakh-ufN2psIa012HXe+LvDLADg@public.gmane.org>
On Wed, Oct 7, 2009 at 14:47, Alexander Strakh wrote:
> KERNEL_VERSION: 2.6.31
> DESCRIBE:
> Driver drivers/net/znet.c might sleep in atomic context, because it calls
> free_dma under claim_dma_lock:
>
> .drivers/net/znet.c:
> 168 static int znet_request_resources (struct net_device *dev)
> ...
> 189 flags = claim_dma_lock();
> 190 free_dma (znet->tx_dma);
> 191 release_dma_lock (flags);
> ...
>
> Path to might_sleep macro from znet_request_resources:
> 1. znet_request_resources calls free_dma at
> arch/blackfin/kernel/bfin_dma_5xx.c:181
> 2. free_dma calls arch/blackfin/kernel/bfin_dma_5xx.c:195
i dont think we need the dmalock mutex. it's only used to protect
read/writes to .chan_status, and that should be atomic already.
-mike
_______________________________________________
Uclinux-dist-devel mailing list
Uclinux-dist-devel@blackfin.uclinux.org
https://blackfin.uclinux.org/mailman/listinfo/uclinux-dist-devel
^ permalink raw reply
* Re: [Bug #14261] e1000e jumbo frames no longer work: 'Unsupported MTU setting'
From: Jeff Kirsher @ 2009-10-07 19:12 UTC (permalink / raw)
To: Theodore Tso, Jeff Kirsher, Rafael J. Wysocki, Nix,
Linux Kernel Mailing List
In-Reply-To: <20091007183453.GD12971@mit.edu>
On Wed, Oct 7, 2009 at 11:34, Theodore Tso <tytso@mit.edu> wrote:
> On Fri, Oct 02, 2009 at 03:13:07PM -0700, Jeff Kirsher wrote:
>> >> > Patch : http://patchwork.kernel.org/patch/50277/
>> >>
>> > Most likely because it's not in the Linus' tree yet.
>> >
>> > [e1000e maintainers, we have a regression fix to merge, please.]
>>
>> Sorry, I forgot to send this patch out last night. I will send it now.
>
> Do we have a status on this progress of this patch to mainline? Thanks,
>
> - Ted
The patch has been submitted and accepted into David Miller's net-2.6
tree. I will submit the patch for 2.6.31 stable tree once it makes it
into Linus's tree later this week.
--
Cheers,
Jeff
^ permalink raw reply
* Re: [r8169.c] support for 8168D/DP was Re: r8169 chips on some Intel D945GSEJT boards fail to work after
From: Xose Vazquez Perez @ 2009-10-07 19:49 UTC (permalink / raw)
To: Francois Romieu; +Cc: netdev, Rainer.Koenig, Simon Farnsworth
In-Reply-To: <20091006060555.GA22811@electric-eye.fr.zoreil.com>
On 10/06/2009 08:05 AM, Francois Romieu wrote:
> Xose Vazquez Perez <xose.vazquez@gmail.com> :
> [...]
>> Francois, is it ready for 2.6.32-rc2 ?
>
> s/rc2/rc3/ otherwise yes.
>
and, how about to send also to stable tree(2.6.31.x) ?
-thanks-
regards,
--
«Allá muevan feroz guerra, ciegos reyes por un palmo más de tierra;
que yo aquí tengo por mío cuanto abarca el mar bravío, a quien nadie
impuso leyes. Y no hay playa, sea cualquiera, ni bandera de esplendor,
que no sienta mi derecho y dé pecho a mi valor.»
^ permalink raw reply
* [PATCH net-next-2.6] bonding: remove useless assignment
From: Nicolas de Pesloüan @ 2009-10-07 20:06 UTC (permalink / raw)
To: netdev; +Cc: David Miller, Jay Vosburgh, bonding-devel
The variable old_active is first set to bond->curr_active_slave.
Then, it is unconditionally set to new_active, without being used in between.
The first assignment, having no side effect, is useless.
Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
---
Resent after fixing tab to space corruption.
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a7e731f..fce7233 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1084,7 +1084,7 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
int mintime = bond->params.updelay;
int i;
- new_active = old_active = bond->curr_active_slave;
+ new_active = bond->curr_active_slave;
if (!new_active) { /* there were no active slaves left */
if (bond->slave_cnt > 0) /* found one slave */
^ permalink raw reply related
* Re: [Bonding-devel] [PATCH net-next-2.6] bonding: remove useless assignment
From: Nicolas de Pesloüan @ 2009-10-07 20:24 UTC (permalink / raw)
To: netdev; +Cc: Jay Vosburgh, David Miller, bonding-devel
In-Reply-To: <4ACCF4D5.9050502@free.fr>
Nicolas de Pesloüan wrote:
> The variable old_active is first set to bond->curr_active_slave.
> Then, it is unconditionally set to new_active, without being used in between.
>
> The first assignment, having no side effect, is useless.
>
> Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
> Reviewed-by: Jiri Pirko <jpirko@redhat.com>
>
> ---
>
> Resent after fixing tab to space corruption.
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index a7e731f..fce7233 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -1084,7 +1084,7 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
> int mintime = bond->params.updelay;
> int i;
>
> - new_active = old_active = bond->curr_active_slave;
> + new_active = bond->curr_active_slave;
>
> if (!new_active) { /* there were no active slaves left */
> if (bond->slave_cnt > 0) /* found one slave */
Apparently still some issues with patch formating. I will investigate this and post later.
Nicolas.
^ permalink raw reply
* Re: [PATCH 0/4][RFC]: coding convention for CCID-struct prefixes
From: David Miller @ 2009-10-07 20:51 UTC (permalink / raw)
To: acme; +Cc: gerrit, dccp, netdev
In-Reply-To: <20091007133159.GI16562@ghostprotocols.net>
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Wed, 7 Oct 2009 10:31:59 -0300
> For the 4 patches:
>
> Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
All applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH 3/4] ethoc: align received packet to make IP header at word boundary
From: David Miller @ 2009-10-07 20:52 UTC (permalink / raw)
To: shemminger; +Cc: thomas, netdev
In-Reply-To: <20091007091337.532d9ed1@nehalam>
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Wed, 7 Oct 2009 09:13:37 -0700
> On Mon, 5 Oct 2009 17:33:19 +0800
> Thomas Chou <thomas@wytron.com.tw> wrote:
>
>> diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
>> index f92747f..0c6c7f4 100644
>> --- a/drivers/net/ethoc.c
>> +++ b/drivers/net/ethoc.c
>> @@ -399,6 +399,10 @@ static int ethoc_rx(struct net_device *dev, int limit)
>> if (ethoc_update_rx_stats(priv, &bd) == 0) {
>> int size = bd.stat >> 16;
>> struct sk_buff *skb = netdev_alloc_skb(dev, size);
>> +
>> + size -= 4; /* strip the CRC */
>> + skb_reserve(skb, 2); /* align TCP/IP header */
>
> Please use NET_IP_ALIGN rather than hard coding 2 so that the value
> can be changed on a per-cpu architecture basis if desired.
Indeed.
Thomas please send a patch to fix this up, thanks.
^ permalink raw reply
* Re: [PATCH RESEND] include/netdevice.h: fix nanodoc mismatch
From: David Miller @ 2009-10-07 20:53 UTC (permalink / raw)
To: w.sang; +Cc: netdev
In-Reply-To: <1254920758-31875-1-git-send-email-w.sang@pengutronix.de>
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Wed, 7 Oct 2009 15:05:58 +0200
> nanodoc was missing an ndo_-prefix.
>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Applied, FOR REAL this time! :-)
^ permalink raw reply
* Re: [PATCH net-next-2.6] bonding: remove useless assignment
From: David Miller @ 2009-10-07 20:54 UTC (permalink / raw)
To: nicolas.2p.debian; +Cc: netdev, fubar, bonding-devel
In-Reply-To: <4ACCF4D5.9050502@free.fr>
From: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Date: Wed, 07 Oct 2009 22:06:45 +0200
> Resent after fixing tab to space corruption.
It's still breaking up long lines, two examples:
> diff --git a/drivers/net/bonding/bond_main.c
> b/drivers/net/bonding/bond_main.c
...
> @@ -1084,7 +1084,7 @@ static struct slave *bond_find_best_slave(struct
> bonding *bond)
Please fix this and resubmit.
^ permalink raw reply
* Re: [PATCH] Add sk_mark route lookup support for IPv4 listening sockets, and for IPv4 multicast forwarding
From: David Miller @ 2009-10-07 20:56 UTC (permalink / raw)
To: atis; +Cc: netdev, panther, eric.dumazet, brian.haley, zenczykowski
In-Reply-To: <200910071559.56526.atis@mikrotik.com>
From: Atis Elsts <atis@mikrotik.com>
Date: Wed, 7 Oct 2009 15:59:56 +0300
> Here is the sk_mark part.
Applied, thanks.
> As for the ipmr.c code, I agree with your comment. Using mark from
> skb probably is wrong in case of tunnel interface (i.e. in the "if
> (vif->flags&VIFF_TUNNEL)" part of the patch), my mistake. I still
> think that the "else" part is correct, though, because using mark
> from skb there mirrors behaviour for unicast forwarding routing
> lookup in ip_route_input_slow(). The same applies to IPv6 code in
> ip6mr_forward2().
Ok submit just the else part and we'll have a look at it.
Thanks.
^ permalink raw reply
* Re: [PATCH] IPv6: Fix 6RD build error
From: David Miller @ 2009-10-07 20:57 UTC (permalink / raw)
To: brian.haley; +Cc: yoshfuji, netdev
In-Reply-To: <4ACCAD46.2020800@hp.com>
From: Brian Haley <brian.haley@hp.com>
Date: Wed, 07 Oct 2009 11:01:26 -0400
> Fix build error introduced in commit fa857afcf - ipv6 sit: 6rd
> (IPv6 Rapid Deployment) Support. Struct in6_addr is the issue.
> I'm only seeing this on x86_64 systems, not on 32-bit with same
> IPv6 config options, so it could be there's a missing forward
> declaration somewhere, but including the correct header file
> fixes the problem too.
>
> CC [M] net/ipv6/ip6_tunnel.o
> In file included from net/ipv6/ip6_tunnel.c:31:
> include/linux/if_tunnel.h:59: error: field ‘prefix’ has incomplete type
> make[2]: *** [net/ipv6/ip6_tunnel.o] Error 1
> make[1]: *** [net/ipv6] Error 2
>
> Signed-off-by: Brian Haley <brian.haley@hp.com>
Funny, I didn't see this on sparc64.
Applied, thanks Brian!
^ permalink raw reply
* Re: [PATCH] IPv6: use ipv6_addr_copy() in ip6_route_redirect()
From: David Miller @ 2009-10-07 20:58 UTC (permalink / raw)
To: brian.haley; +Cc: netdev
In-Reply-To: <4ACCB7ED.7070901@hp.com>
From: Brian Haley <brian.haley@hp.com>
Date: Wed, 07 Oct 2009 11:46:53 -0400
> Change ip6_route_redirect() to use ipv6_addr_copy().
>
> Signed-off-by: Brian Haley <brian.haley@hp.com>
Applied.
^ permalink raw reply
* Re: [PATCH] IPv6: use ipv6_addr_set_v4mapped()
From: David Miller @ 2009-10-07 20:58 UTC (permalink / raw)
To: brian.haley; +Cc: netdev
In-Reply-To: <4ACCB816.2000902@hp.com>
From: Brian Haley <brian.haley@hp.com>
Date: Wed, 07 Oct 2009 11:47:34 -0400
> Might as well use the ipv6_addr_set_v4mapped() inline we created last
> year.
>
> Signed-off-by: Brian Haley <brian.haley@hp.com>
Also applied, thanks.
^ permalink raw reply
* [PATCH netnext-2.6] bonding: fix a parameter name in error message
From: Nicolas de Pesloüan @ 2009-10-07 20:59 UTC (permalink / raw)
To: fubar, davem; +Cc: netdev, bonding-devel
When parsing module parameters, bond_check_params() erroneously use 'xor_mode'
as the name of a module parameter in an error message.
The right name for this parameter is 'xmit_hash_policy'.
Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
---
drivers/net/bonding/bond_main.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 69c5b15..20dc5a2 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -4665,7 +4665,8 @@ static int bond_check_params(struct bond_params *params)
if ((bond_mode != BOND_MODE_XOR) &&
(bond_mode != BOND_MODE_8023AD)) {
pr_info(DRV_NAME
- ": xor_mode param is irrelevant in mode %s\n",
+ ": xmit_hash_policy param is irrelevant in"
+ " mode %s\n",
bond_mode_name(bond_mode));
} else {
xmit_hashtype = bond_parse_parm(xmit_hash_policy,
--
1.6.3.3
^ permalink raw reply related
* [PATCH netnext-2.6] bonding: remove useless assignment
From: Nicolas de Pesloüan @ 2009-10-07 20:59 UTC (permalink / raw)
To: fubar, davem; +Cc: netdev, bonding-devel
In-Reply-To: <1254949168-12404-1-git-send-email-nicolas.2p.debian@free.fr>
The variable old_active is first set to bond->curr_active_slave.
Then, it is unconditionally set to new_active, without being used in between.
The first assignment, having no side effect, is useless.
Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Reviewed-by: Jiri Pirko <jpirko@redhat.com>
---
drivers/net/bonding/bond_main.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 20dc5a2..34bdea5 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1084,7 +1084,7 @@ static struct slave *bond_find_best_slave(struct bonding *bond)
int mintime = bond->params.updelay;
int i;
- new_active = old_active = bond->curr_active_slave;
+ new_active = bond->curr_active_slave;
if (!new_active) { /* there were no active slaves left */
if (bond->slave_cnt > 0) /* found one slave */
--
1.6.3.3
^ permalink raw reply related
* Re: [PATCH netnext-2.6] bonding: fix a parameter name in error message
From: David Miller @ 2009-10-07 21:10 UTC (permalink / raw)
To: nicolas.2p.debian; +Cc: fubar, netdev, bonding-devel
In-Reply-To: <1254949168-12404-1-git-send-email-nicolas.2p.debian@free.fr>
From: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Date: Wed, 7 Oct 2009 22:59:27 +0200
> When parsing module parameters, bond_check_params() erroneously use 'xor_mode'
> as the name of a module parameter in an error message.
>
> The right name for this parameter is 'xmit_hash_policy'.
>
> Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Applied.
^ permalink raw reply
* Re: [PATCH netnext-2.6] bonding: remove useless assignment
From: David Miller @ 2009-10-07 21:11 UTC (permalink / raw)
To: nicolas.2p.debian; +Cc: fubar, netdev, bonding-devel
In-Reply-To: <1254949168-12404-2-git-send-email-nicolas.2p.debian@free.fr>
From: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
Date: Wed, 7 Oct 2009 22:59:28 +0200
> The variable old_active is first set to bond->curr_active_slave.
> Then, it is unconditionally set to new_active, without being used in between.
>
> The first assignment, having no side effect, is useless.
>
> Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
> Reviewed-by: Jiri Pirko <jpirko@redhat.com>
Also applied.
Conclusion, avoid Thunderbird like the plague....
^ permalink raw reply
* Re: [PATCH 2/3] Incomplete type for struct in6_addr
From: David Miller @ 2009-10-07 21:42 UTC (permalink / raw)
To: hagen; +Cc: netdev
In-Reply-To: <1254951282-5056-3-git-send-email-hagen@jauu.net>
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 7 Oct 2009 23:34:41 +0200
> if_tunnel.h defines a new struct consisting of struct in6_addr,
> but the definition is defined in linux/in6.h - so we must
> include them beforehand.
>
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Already fixed in net-next-2.6
^ permalink raw reply
* Re: [PATCH 1/3] Fix redeclaration of symbol len
From: David Miller @ 2009-10-07 21:43 UTC (permalink / raw)
To: hagen; +Cc: netdev
In-Reply-To: <1254951282-5056-2-git-send-email-hagen@jauu.net>
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 7 Oct 2009 23:34:40 +0200
> Function argument len was redeclarated within the
> function. This patch fix the redeclaration of symbol 'len'.
>
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
In the future please indicate the area you are touching
in the subject line so that it shows up in the header
line of the commit message. I added "econet: " to your
subject to fix this.
Applied, thanks.
^ permalink raw reply
* [PATCH 3/3] Define cipso_v4_delopt static
From: Hagen Paul Pfeifer @ 2009-10-07 21:34 UTC (permalink / raw)
To: netdev; +Cc: davem
In-Reply-To: <1254951282-5056-1-git-send-email-hagen@jauu.net>
There is no reason that cipso_v4_delopt() is not
defined as a static function.
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
net/ipv4/cipso_ipv4.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv4/cipso_ipv4.c b/net/ipv4/cipso_ipv4.c
index 039cc1f..1e029dc 100644
--- a/net/ipv4/cipso_ipv4.c
+++ b/net/ipv4/cipso_ipv4.c
@@ -2017,7 +2017,7 @@ req_setattr_failure:
* values on failure.
*
*/
-int cipso_v4_delopt(struct ip_options **opt_ptr)
+static int cipso_v4_delopt(struct ip_options **opt_ptr)
{
int hdr_delta = 0;
struct ip_options *opt = *opt_ptr;
--
1.6.3.GIT
^ permalink raw reply related
* [PATCH 2/3] Incomplete type for struct in6_addr
From: Hagen Paul Pfeifer @ 2009-10-07 21:34 UTC (permalink / raw)
To: netdev; +Cc: davem
In-Reply-To: <1254951282-5056-1-git-send-email-hagen@jauu.net>
if_tunnel.h defines a new struct consisting of struct in6_addr,
but the definition is defined in linux/in6.h - so we must
include them beforehand.
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
include/linux/if_tunnel.h | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index c53c8e0..8d76cb4 100644
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -5,6 +5,7 @@
#ifdef __KERNEL__
#include <linux/ip.h>
+#include <linux/in6.h>
#endif
#define SIOCGETTUNNEL (SIOCDEVPRIVATE + 0)
--
1.6.3.GIT
^ permalink raw reply related
* Minor net/ fixes
From: Hagen Paul Pfeifer @ 2009-10-07 21:34 UTC (permalink / raw)
To: netdev; +Cc: davem
Hello netdev, hello davem,
I, ... I mean cgcc stumbled across several dubious code. The
following patches address them. ;)
Hagen
--
Hagen Paul Pfeifer <hagen@jauu.net> || http://jauu.net/
Telephone: +49 174 5455209 || Key Id: 0x98350C22
Key Fingerprint: 490F 557B 6C48 6D7E 5706 2EA2 4A22 8D45 9835 0C22
^ permalink raw reply
* [PATCH 1/3] Fix redeclaration of symbol len
From: Hagen Paul Pfeifer @ 2009-10-07 21:34 UTC (permalink / raw)
To: netdev; +Cc: davem
In-Reply-To: <1254951282-5056-1-git-send-email-hagen@jauu.net>
Function argument len was redeclarated within the
function. This patch fix the redeclaration of symbol 'len'.
Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
---
net/econet/af_econet.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net/econet/af_econet.c b/net/econet/af_econet.c
index 6529be3..5e9426a 100644
--- a/net/econet/af_econet.c
+++ b/net/econet/af_econet.c
@@ -457,15 +457,15 @@ static int econet_sendmsg(struct kiocb *iocb, struct socket *sock,
iov[0].iov_len = size;
for (i = 0; i < msg->msg_iovlen; i++) {
void __user *base = msg->msg_iov[i].iov_base;
- size_t len = msg->msg_iov[i].iov_len;
+ size_t iov_len = msg->msg_iov[i].iov_len;
/* Check it now since we switch to KERNEL_DS later. */
- if (!access_ok(VERIFY_READ, base, len)) {
+ if (!access_ok(VERIFY_READ, base, iov_len)) {
mutex_unlock(&econet_mutex);
return -EFAULT;
}
iov[i+1].iov_base = base;
- iov[i+1].iov_len = len;
- size += len;
+ iov[i+1].iov_len = iov_len;
+ size += iov_len;
}
/* Get a skbuff (no data, just holds our cb information) */
--
1.6.3.GIT
^ permalink raw reply related
* Re: [PATCH 3/3] Define cipso_v4_delopt static
From: David Miller @ 2009-10-07 21:46 UTC (permalink / raw)
To: hagen; +Cc: netdev
In-Reply-To: <1254951282-5056-4-git-send-email-hagen@jauu.net>
From: Hagen Paul Pfeifer <hagen@jauu.net>
Date: Wed, 7 Oct 2009 23:34:42 +0200
> There is no reason that cipso_v4_delopt() is not
> defined as a static function.
>
> Signed-off-by: Hagen Paul Pfeifer <hagen@jauu.net>
Also applied, thanks.
Same subject line problem, I added "ipv4: " to this one.
^ permalink raw reply
* [PATCH] IPv6: Fix 6RD typo
From: Alexandre Cassen @ 2009-10-07 21:45 UTC (permalink / raw)
To: netdev
Following fix a small typo.
Signed-off-by: Alexandre Cassen <acassen@freebox.fr>
---
net/ipv6/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index f561998..a578096 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -171,7 +171,7 @@ config IPV6_SIT
Saying M here will produce a module called sit. If unsure, say Y.
config IPV6_SIT_6RD
- bool "IPv6: IPv6 Rapid Development (6RD) (EXPERIMENTAL)"
+ bool "IPv6: IPv6 Rapid Deployment (6RD) (EXPERIMENTAL)"
depends on IPV6_SIT && EXPERIMENTAL
default n
---help---
--
1.6.0.4
^ permalink raw reply related
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