3 files changed, 41 insertions, 40 deletions

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 56000b33340b..61d1a89baeaf 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -249,15 +249,6 @@ Who:	Ravikiran Thirumalai <kiran@scalex86.org>
 
 ---------------------------
 
-What:   Code that is now under CONFIG_WIRELESS_EXT_SYSFS
-        (in net/core/net-sysfs.c)
-When:   3.5
-Why:    Over 1K .text/.data size reduction, data is available in other
-        ways (ioctls)
-Who:    Johannes Berg <johannes@sipsolutions.net>
-
----------------------------
-
 What:   sysfs ui for changing p4-clockmod parameters
 When:   September 2009
 Why:    See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and
@@ -414,21 +405,6 @@ Who:	Jean Delvare <khali@linux-fr.org>
 
 ----------------------------
 
-What:   xt_connlimit rev 0
-When:   2012
-Who:    Jan Engelhardt <jengelh@medozas.de>
-Files:  net/netfilter/xt_connlimit.c
-
-----------------------------
-
-What:   ipt_addrtype match include file
-When:   2012
-Why:    superseded by xt_addrtype
-Who:    Florian Westphal <fw@strlen.de>
-Files:  include/linux/netfilter_ipv4/ipt_addrtype.h
-
-----------------------------
-
 What:   i2c_driver.attach_adapter
         i2c_driver.detach_adapter
 When:   September 2011
@@ -449,6 +425,19 @@ Who:	Hans Verkuil <hans.verkuil@cisco.com>
 
 ----------------------------
 
+What:   CONFIG_CFG80211_WEXT
+When:   as soon as distributions ship new wireless tools, ie. wpa_supplicant 1.0
+        and NetworkManager/connman/etc. that are able to use nl80211
+Why:    Wireless extensions are deprecated, and userland tools are moving to
+        using nl80211. New drivers are no longer using wireless extensions,
+        and while there might still be old drivers, both new drivers and new
+        userland no longer needs them and they can't be used for an feature
+        developed in the past couple of years. As such, compatibility with
+        wireless extensions in new drivers will be removed.
+Who:    Johannes Berg <johannes@sipsolutions.net>
+
+----------------------------
+
 What:   g_file_storage driver
 When:   3.8
 Why:    This driver has been superseded by g_mass_storage.
@@ -589,6 +578,13 @@ Why:	Remount currently allows changing bound subsystems and
 
 ----------------------------
 
+What:  xt_recent rev 0
+When:  2013
+Who:   Pablo Neira Ayuso <pablo@netfilter.org>
+Files: net/netfilter/xt_recent.c
+
+----------------------------
+
 What:   KVM debugfs statistics
 When:   2013
 Why:    KVM tracepoints provide mostly equivalent information in a much more
diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index ac295399f0d4..a06741898f29 100644
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -232,16 +232,16 @@ solution for a couple of reasons:
   arbitration problems and error frames caused by the different
   ECUs. The occurrence of detected errors are important for diagnosis
   and have to be logged together with the exact timestamp. For this
-  reason the CAN interface driver can generate so called Error Frames
-  that can optionally be passed to the user application in the same
-  way as other CAN frames. Whenever an error on the physical layer
+  reason the CAN interface driver can generate so called Error Message
+  Frames that can optionally be passed to the user application in the
+  same way as other CAN frames. Whenever an error on the physical layer
   or the MAC layer is detected (e.g. by the CAN controller) the driver
-  creates an appropriate error frame. Error frames can be requested by
-  the user application using the common CAN filter mechanisms. Inside
-  this filter definition the (interested) type of errors may be
-  selected. The reception of error frames is disabled by default.
-  The format of the CAN error frame is briefly described in the Linux
-  header file "include/linux/can/error.h".
+  creates an appropriate error message frame. Error messages frames can
+  be requested by the user application using the common CAN filter
+  mechanisms. Inside this filter definition the (interested) type of
+  errors may be selected. The reception of error messages is disabled
+  by default. The format of the CAN error message frame is briefly
+  described in the Linux header file "include/linux/can/error.h".
 
 4. How to use Socket CAN
 ------------------------
@@ -383,7 +383,7 @@ solution for a couple of reasons:
   defaults are set at RAW socket binding time:
 
   - The filters are set to exactly one filter receiving everything
-  - The socket only receives valid data frames (=> no error frames)
+  - The socket only receives valid data frames (=> no error message frames)
   - The loopback of sent CAN frames is enabled (see chapter 3.2)
   - The socket does not receive its own sent frames (in loopback mode)
 
@@ -434,7 +434,7 @@ solution for a couple of reasons:
   4.1.2 RAW socket option CAN_RAW_ERR_FILTER
 
   As described in chapter 3.4 the CAN interface driver can generate so
-  called Error Frames that can optionally be passed to the user
+  called Error Message Frames that can optionally be passed to the user
   application in the same way as other CAN frames. The possible
   errors are divided into different error classes that may be filtered
   using the appropriate error mask. To register for every possible
@@ -527,7 +527,7 @@ solution for a couple of reasons:
 
     rcvlist_all - list for unfiltered entries (no filter operations)
     rcvlist_eff - list for single extended frame (EFF) entries
-    rcvlist_err - list for error frames masks
+    rcvlist_err - list for error message frames masks
     rcvlist_fil - list for mask/value filters
     rcvlist_inv - list for mask/value filters (inverse semantic)
     rcvlist_sff - list for single standard frame (SFF) entries
@@ -784,13 +784,13 @@ solution for a couple of reasons:
     $ ip link set canX type can restart-ms 100
 
   Alternatively, the application may realize the "bus-off" condition
-  by monitoring CAN error frames and do a restart when appropriate with
-  the command:
+  by monitoring CAN error message frames and do a restart when
+  appropriate with the command:
 
     $ ip link set canX type can restart
 
-  Note that a restart will also create a CAN error frame (see also
-  chapter 3.4).
+  Note that a restart will also create a CAN error message frame (see
+  also chapter 3.4).
 
   6.6 Supported CAN hardware
 
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index 6f896b94abdc..99d0e0504d6e 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -862,6 +862,11 @@ accept_local - BOOLEAN
         local interfaces over the wire and have them accepted properly.
         default FALSE
 
+route_localnet - BOOLEAN
+        Do not consider loopback addresses as martian source or destination
+        while routing. This enables the use of 127/8 for local routing purposes.
+        default FALSE
+
 rp_filter - INTEGER
         0 - No source validation.
         1 - Strict mode as defined in RFC3704 Strict Reverse Path