3 files changed, 12 insertions, 11 deletions

diff --git a/net/ipv6/Kconfig b/net/ipv6/Kconfig
index ec992159b5f8..ca8cb326d1d2 100644
--- a/net/ipv6/Kconfig
+++ b/net/ipv6/Kconfig
@@ -22,17 +22,17 @@ menuconfig IPV6
 if IPV6
 
 config IPV6_PRIVACY
-        bool "IPv6: Privacy Extensions support"
+        bool "IPv6: Privacy Extensions (RFC 3041) support"
         ---help---
           Privacy Extensions for Stateless Address Autoconfiguration in IPv6
-          support.  With this option, additional periodically-alter 
-          pseudo-random global-scope unicast address(es) will assigned to
+          support.  With this option, additional periodically-altered
+          pseudo-random global-scope unicast address(es) will be assigned to
           your interface(s).
         
-          We use our standard pseudo random algorithm to generate randomized
-          interface identifier, instead of one described in RFC 3041.
+          We use our standard pseudo-random algorithm to generate the
+          randomized interface identifier, instead of one described in RFC 3041.
 
-          By default, kernel do not generate temporary addresses.
+          By default the kernel does not generate temporary addresses.
           To use temporary addresses, do
         
                 echo 2 >/proc/sys/net/ipv6/conf/all/use_tempaddr 
@@ -43,9 +43,9 @@ config IPV6_ROUTER_PREF
         bool "IPv6: Router Preference (RFC 4191) support"
         ---help---
           Router Preference is an optional extension to the Router
-          Advertisement message to improve the ability of hosts
-          to pick more appropriate router, especially when the hosts
-          is placed in a multi-homed network.
+          Advertisement message which improves the ability of hosts
+          to pick an appropriate router, especially when the hosts
+          are placed in a multi-homed network.
 
           If unsure, say N.
 
diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
index e89cfa3a8f25..dfed176aed37 100644
--- a/net/ipv6/netfilter/ip6_tables.c
+++ b/net/ipv6/netfilter/ip6_tables.c
@@ -365,7 +365,7 @@ ip6t_do_table(struct sk_buff *skb,
 
         IP_NF_ASSERT(table->valid_hooks & (1 << hook));
 
-        rcu_read_lock();
+        rcu_read_lock_bh();
         private = rcu_dereference(table->private);
         table_base = rcu_dereference(private->entries[smp_processor_id()]);
 
@@ -466,7 +466,7 @@ ip6t_do_table(struct sk_buff *skb,
 #ifdef CONFIG_NETFILTER_DEBUG
         ((struct ip6t_entry *)table_base)->comefrom = NETFILTER_LINK_POISON;
 #endif
-        rcu_read_unlock();
+        rcu_read_unlock_bh();
 
 #ifdef DEBUG_ALLOW_ALL
         return NF_ACCEPT;
diff --git a/net/ipv6/xfrm6_output.c b/net/ipv6/xfrm6_output.c
index 0af823cf7f1f..5ee5a031bc93 100644
--- a/net/ipv6/xfrm6_output.c
+++ b/net/ipv6/xfrm6_output.c
@@ -72,6 +72,7 @@ int xfrm6_prepare_output(struct xfrm_state *x, struct sk_buff *skb)
 #endif
 
         skb->protocol = htons(ETH_P_IPV6);
+        skb->local_df = 1;
 
         return x->outer_mode->output2(x, skb);
 }