Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

Pull networking update from David Miller:

 1) Checkpoint/restarted TCP sockets now can properly propagate the TCP
    timestamp offset.  From Andrey Vagin.

 2) VMWARE VM VSOCK layer, from Andy King.

 3) Much improved support for virtual functions and SR-IOV in bnx2x,
    from Ariel ELior.

 4) All protocols on ipv4 and ipv6 are now network namespace aware, and
    all the compatability checks for initial-namespace-only protocols is
    removed.  Thanks to Tom Parkin for helping deal with the last major
    holdout, L2TP.

 5) IPV6 support in netpoll and network namespace support in pktgen,
    from Cong Wang.

 6) Multiple Registration Protocol (MRP) and Multiple VLAN Registration
    Protocol (MVRP) support, from David Ward.

 7) Compute packet lengths more accurately in the packet scheduler, from
    Eric Dumazet.

 8) Use per-task page fragment allocator in skb_append_datato_frags(),
    also from Eric Dumazet.

 9) Add support for connection tracking labels in netfilter, from
    Florian Westphal.

10) Fix default multicast group joining on ipv6, and add anti-spoofing
    checks to 6to4 and 6rd.  From Hannes Frederic Sowa.

11) Make ipv4/ipv6 fragmentation memory limits more reasonable in modern
    times, rearrange inet frag datastructures for better cacheline
    locality, and move more operations outside of locking.  From Jesper
    Dangaard Brouer.

12) Instead of strict master <--> slave relationships, allow arbitrary
    scenerios with "upper device lists".  From Jiri Pirko.

13) Improve rate limiting accuracy in TBF and act_police, also from Jiri
    Pirko.

14) Add a BPF filter netfilter match target, from Willem de Bruijn.

15) Orphan and delete a bunch of pre-historic networking drivers from
    Paul Gortmaker.

16) Add TSO support for GRE tunnels, from Pravin B SHelar.  Although
    this still needs some minor bug fixing before it's %100 correct in
    all cases.

17) Handle unresolved IPSEC states like ARP, with a resolution packet
    queue.  From Steffen Klassert.

18) Remove TCP Appropriate Byte Count support (ABC), from Stephen
    Hemminger.  This was long overdue.

19) Support SO_REUSEPORT, from Tom Herbert.

20) Allow locking a socket BPF filter, so that it cannot change after a
    process drops capabilities.

21) Add VLAN filtering to bridge, from Vlad Yasevich.

22) Bring ipv6 on-par with ipv4 and do not cache neighbour entries in
    the ipv6 routes, from YOSHIFUJI Hideaki.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1538 commits)
  ipv6: fix race condition regarding dst->expires and dst->from.
  net: fix a wrong assignment in skb_split()
  ip_gre: remove an extra dst_release()
  ppp: set qdisc_tx_busylock to avoid LOCKDEP splat
  atl1c: restore buffer state
  net: fix a build failure when !CONFIG_PROC_FS
  net: ipv4: fix waring -Wunused-variable
  net: proc: fix build failed when procfs is not configured
  Revert "xen: netback: remove redundant xenvif_put"
  net: move procfs code to net/core/net-procfs.c
  qmi_wwan, cdc-ether: add ADU960S
  bonding: set sysfs device_type to 'bond'
  bonding: fix bond_release_all inconsistencies
  b44: use netdev_alloc_skb_ip_align()
  xen: netback: remove redundant xenvif_put
  net: fec: Do a sanity check on the gpio number
  ip_gre: propogate target device GSO capability to the tunnel device
  ip_gre: allow CSUM capable devices to handle packets
  bonding: Fix initialize after use for 3ad machine state spinlock
  bonding: Fix race condition between bond_enslave() and bond_3ad_update_lacp_rate()
  ...

20 files changed, 320 insertions, 624 deletions

diff --git a/Documentation/DocBook/80211.tmpl b/Documentation/DocBook/80211.tmpl
index 42e7f030cb16..284ced7a228f 100644
--- a/Documentation/DocBook/80211.tmpl
+++ b/Documentation/DocBook/80211.tmpl
@@ -107,8 +107,8 @@
 !Finclude/net/cfg80211.h key_params
 !Finclude/net/cfg80211.h survey_info_flags
 !Finclude/net/cfg80211.h survey_info
-!Finclude/net/cfg80211.h beacon_parameters
-!Finclude/net/cfg80211.h plink_actions
+!Finclude/net/cfg80211.h cfg80211_beacon_data
+!Finclude/net/cfg80211.h cfg80211_ap_settings
 !Finclude/net/cfg80211.h station_parameters
 !Finclude/net/cfg80211.h station_info_flags
 !Finclude/net/cfg80211.h rate_info_flags
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index 6ddd0286a9b7..ecfdf756d10f 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -24,6 +24,8 @@ Required properties:
 Optional properties:
 - ti,hwmods             : Must be "cpgmac0"
 - no_bd_ram             : Must be 0 or 1
+- dual_emac             : Specifies Switch to act as Dual EMAC
+- dual_emac_res_vlan    : Specifies VID to be used to segregate the ports
 
 Note: "ti,hwmods" field is used to fetch the base address and irq
 resources from TI, omap hwmod data base during device registration.
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 2152b0e7237d..3210540f8bd3 100644
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -179,7 +179,7 @@ Code  Seq#(hex)	Include File		Comments
 'V'     C0      media/davinci/vpfe_capture.h    conflict!
 'V'     C0      media/si4713.h          conflict!
 'W'     00-1F   linux/watchdog.h        conflict!
-'W'     00-1F   linux/wanrouter.h       conflict!
+'W'     00-1F   linux/wanrouter.h       conflict!               (pre 3.9)
 'W'     00-3F   sound/asound.h          conflict!
 'X'     all     fs/xfs/xfs_fs.h         conflict!
                 and fs/xfs/linux-2.6/xfs_ioctl32.h
diff --git a/Documentation/magic-number.txt b/Documentation/magic-number.txt
index 82761a31d64d..76d80a64bbe1 100644
--- a/Documentation/magic-number.txt
+++ b/Documentation/magic-number.txt
@@ -122,7 +122,7 @@ SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c
 COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c
 I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c
 TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c
-ROUTER_MAGIC          0x524d4157  wan_device        include/linux/wanrouter.h
+ROUTER_MAGIC          0x524d4157  wan_device        [in wanrouter.h pre 3.9]
 SCC_MAGIC             0x52696368  gs_port           drivers/char/scc.h
 SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c
 GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h
diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 2cc3c7733a2f..258d9b92c36f 100644
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -52,8 +52,6 @@ de4x5.txt
         - the Digital EtherWORKS DE4?? and DE5?? PCI Ethernet driver
 decnet.txt
         - info on using the DECnet networking layer in Linux.
-depca.txt
-        - the Digital DEPCA/EtherWORKS DE1?? and DE2?? LANCE Ethernet driver
 dl2k.txt
         - README for D-Link DL2000-based Gigabit Ethernet Adapters (dl2k.ko).
 dm9000.txt
@@ -72,8 +70,6 @@ e1000e.txt
         - README for the Intel Gigabit Ethernet Driver (e1000e).
 eql.txt
         - serial IP load balancing
-ewrk3.txt
-        - the Digital EtherWORKS 3 DE203/4/5 Ethernet driver
 fib_trie.txt
         - Level Compressed Trie (LC-trie) notes: a structure for routing.
 filter.txt
@@ -126,8 +122,6 @@ ltpc.txt
         - the Apple or Farallon LocalTalk PC card driver
 mac80211-injection.txt
         - HOWTO use packet injection with mac80211
-multicast.txt
-        - Behaviour of cards under Multicast
 multiqueue.txt
         - HOWTO for multiqueue network device support.
 netconsole.txt
diff --git a/Documentation/networking/DLINK.txt b/Documentation/networking/DLINK.txt
deleted file mode 100644
index 55d24433d151..000000000000
--- a/Documentation/networking/DLINK.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-Released 1994-06-13
-
-
-        CONTENTS:
-
-        1. Introduction.
-        2. License.
-        3. Files in this release.
-        4. Installation.
-        5. Problems and tuning.
-        6. Using the drivers with earlier releases.
-        7. Acknowledgments.
-
-
-        1. INTRODUCTION.
-
-        This is a set of Ethernet drivers for the D-Link DE-600/DE-620
-        pocket adapters, for the parallel port on a Linux based machine.
-        Some adapter "clones" will also work.  Xircom is _not_ a clone...
-        These drivers _can_ be used as loadable modules,
-        and were developed for use on Linux 1.1.13 and above.
-        For use on Linux 1.0.X, or earlier releases, see below.
-
-        I have used these drivers for NFS, ftp, telnet and X-clients on
-        remote machines. Transmissions with ftp seems to work as
-        good as can be expected (i.e. > 80k bytes/sec) from a
-        parallel port...:-)  Receive speeds will be about 60-80% of this.
-        Depending on your machine, somewhat higher speeds can be achieved.
-
-        All comments/fixes to Bjorn Ekwall (bj0rn@blox.se).
-
-
-        2. LICENSE.
-
-        This program is free software; you can redistribute it
-        and/or modify it under the terms of the GNU General Public
-        License as published by the Free Software Foundation; either
-        version 2, or (at your option) any later version.
-
-        This program is distributed in the hope that it will be
-        useful, but WITHOUT ANY WARRANTY; without even the implied
-        warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-        PURPOSE. See the GNU General Public License for more
-        details.
-
-        You should have received a copy of the GNU General Public
-        License along with this program; if not, write to the Free
-        Software Foundation, Inc., 675 Mass Ave, Cambridge, MA
-        02139, USA.
-
-
-        3. FILES IN THIS RELEASE.
-
-        README.DLINK  This file.
-        de600.c       The Source (may it be with You :-) for the DE-600
-        de620.c       ditto for the DE-620
-        de620.h       Macros for de620.c
-
-        If you are upgrading from the d-link tar release, there will
-        also be a "dlink-patches" file that will patch Linux 1.1.18:
-                linux/drivers/net/Makefile
-                linux/drivers/net/CONFIG
-                linux/drivers/net/MODULES
-                linux/drivers/net/Space.c
-                linux/config.in
-        Apply the patch by:
-        "cd /usr/src; patch -p0 < linux/drivers/net/dlink-patches"
-        The old source, "linux/drivers/net/d_link.c", can be removed.
-
-
-        4. INSTALLATION.
-
-        o Get the latest net binaries, according to current net.wisdom.
-
-        o Read the NET-2 and Ethernet HOWTOs and modify your setup.
-
-        o If your parallel port has a strange address or irq,
-          modify "linux/drivers/net/CONFIG" accordingly, or adjust
-          the parameters in the "tuning" section in the sources.
-
-        If you are going to use the drivers as loadable modules, do _not_
-        enable them while doing "make config", but instead make sure that
-        the drivers are included in "linux/drivers/net/MODULES".
-
-        If you are _not_ going to use the driver(s) as loadable modules,
-        but instead have them included in the kernel, remember to enable
-        the drivers while doing "make config".
-
-        o To include networking and DE600/DE620 support in your kernel:
-          # cd /linux
-          (as modules:)
-          #  make config (answer yes on CONFIG_NET and CONFIG_INET)
-          (else included in the kernel:)
-          #  make config (answer yes on CONFIG _NET, _INET and _DE600 or _DE620)
-          # make clean
-          # make zImage (or whatever magic you usually do)
-
-        o I use lilo to boot multiple kernels, so that I at least
-          can have one working kernel :-). If you do too, append
-          these lines to /etc/lilo/config:
-
-                image = /linux/zImage
-                label = newlinux
-                root = /dev/hda2 (or whatever YOU have...)
-
-          # /etc/lilo/install
-
-        o Do "sync" and reboot the new kernel with a D-Link
-          DE-600/DE-620 pocket adapter connected.
-
-        o The adapter can be configured with ifconfig eth?
-          where the actual number is decided by the kernel
-          when the drivers are initialized.
-
-
-        5. "PROBLEMS" AND TUNING,
-
-        o If you see error messages from the driver, and if the traffic
-          stops on the adapter, try to do "ifconfig" and "route" once
-          more, just as in "rc.inet1".  This should take care of most
-          problems, including effects from power loss, or adapters that
-          aren't connected to the printer port in some way or another.
-          You can somewhat change the behaviour by enabling/disabling
-          the macro  SHUTDOWN_WHEN_LOST  in the "tuning" section.
-          For the DE-600 there is another macro, CHECK_LOST_DE600,
-          that you might want to read about in the "tuning" section.
-
-        o Some machines have trouble handling the parallel port and
-          the adapter at high speed. If you experience problems:
-
-          DE-600:
-          - The adapter is not recognized at boot, i.e. an Ethernet
-            address of 00:80:c8:... is not shown, try to add another
-              "; SLOW_DOWN_IO"
-            at DE600_SLOW_DOWN in the "tuning" section. As a last resort,
-            uncomment: "#define REALLY_SLOW_IO" (see <asm/io.h> for hints).
-
-          - You experience "timeout" messages: first try to add another
-              "; SLOW_DOWN_IO"
-            at DE600_SLOW_DOWN in the "tuning" section, _then_ try to
-            increase the value (original value: 5) at
-            "if (tickssofar < 5)" near line 422.
-
-          DE-620:
-          - Your parallel port might be "sluggish".  To cater for
-            this, there are the macros LOWSPEED and READ_DELAY/WRITE_DELAY
-            in the "tuning" section. Your first step should be to enable
-            LOWSPEED, and after that you can "tune" the XXX_DELAY values.
-
-        o If the adapter _is_ recognized at boot but you get messages
-          about "Network Unreachable", then the problem is probably
-          _not_ with the driver.  Check your net configuration instead
-          (ifconfig and route) in "rc.inet1".
-
-        o There is some rudimentary support for debugging, look at
-          the source. Use "-DDE600_DEBUG=3" or "-DDE620_DEBUG=3"
-          when compiling, or include it in "linux/drivers/net/CONFIG".
-          IF YOU HAVE PROBLEMS YOU CAN'T SOLVE: PLEASE COMPILE THE DRIVER
-          WITH DEBUGGING ENABLED, AND SEND ME THE RESULTING OUTPUT!
-
-
-        6. USING THE DRIVERS WITH EARLIER RELEASES.
-
-        The later 1.1.X releases of the Linux kernel include some
-        changes in the networking layer (a.k.a. NET3). This affects
-        these drivers in a few places.  The hints that follow are
-        _not_ tested by me, since I don't have the disk space to keep
-        all releases on-line.
-        Known needed changes to date:
-        - release patchfile: some patches will fail, but they should
-          be easy to apply "by hand", since they are trivial.
-          (Space.c: d_link_init() is now called de600_probe())
-        - de600.c: change  "mark_bh(NET_BH)" to  "mark_bh(INET_BH)".
-        - de620.c: (maybe) change the code around "netif_rx(skb);" to be
-                   similar to the code around "dev_rint(...)" in de600.c
-
-
-        7. ACKNOWLEDGMENTS.
-
-        These drivers wouldn't have been done without the base
-        (and support) from Ross Biro, and D-Link Systems Inc.
-        The driver relies upon GPL-ed source from D-Link Systems Inc.
-        and from Russel Nelson at Crynwr Software <nelson@crynwr.com>.
-
-        Additional input also from:
-        Donald Becker <becker@super.org>, Alan Cox <A.Cox@swansea.ac.uk>
-        and Fred N. van Kempen <waltje@uWalt.NL.Mugnet.ORG>
-
-        DE-600 alpha release primary victim^H^H^H^H^H^Htester:
-        - Erik Proper <erikp@cs.kun.nl>.
-        Good input also from several users, most notably
-        - Mark Burton <markb@ordern.demon.co.uk>.
-
-        DE-620 alpha release victims^H^H^H^H^H^H^Htesters:
-        - J. Joshua Kopper <kopper@rtsg.mot.com>
-        - Olav Kvittem <Olav.Kvittem@uninett.no>
-        - Germano Caronni <caronni@nessie.cs.id.ethz.ch>
-        - Jeremy Fitzhardinge <jeremy@suite.sw.oz.au>
-
-
-        Happy hacking!
-
-        Bjorn Ekwall == bj0rn@blox.se
diff --git a/Documentation/networking/LICENSE.qlcnic b/Documentation/networking/LICENSE.qlcnic
index e7fb2c6023bc..2ae3b64983ab 100644
--- a/Documentation/networking/LICENSE.qlcnic
+++ b/Documentation/networking/LICENSE.qlcnic
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011 QLogic Corporation
+Copyright (c) 2009-2013 QLogic Corporation
 QLogic Linux qlcnic NIC Driver
 
 You may modify and redistribute the device driver code under the
diff --git a/Documentation/networking/cs89x0.txt b/Documentation/networking/cs89x0.txt
index c725d33b316f..0e190180eec8 100644
--- a/Documentation/networking/cs89x0.txt
+++ b/Documentation/networking/cs89x0.txt
@@ -36,7 +36,6 @@ TABLE OF CONTENTS
     4.1 Compiling the Driver as a Loadable Module
     4.2 Compiling the driver to support memory mode
     4.3 Compiling the driver to support Rx DMA 
-    4.4 Compiling the Driver into the Kernel
 
 5.0 TESTING AND TROUBLESHOOTING
     5.1 Known Defects and Limitations
@@ -364,84 +363,6 @@ The compile-time optionality for DMA was removed in the 2.3 kernel
 series.  DMA support is now unconditionally part of the driver.  It is
 enabled by the 'use_dma=1' module option.
 
-4.4 COMPILING THE DRIVER INTO THE KERNEL
-
-If your Linux distribution already has support for the cs89x0 driver
-then simply copy the source file to the /usr/src/linux/drivers/net
-directory to replace the original ones and run the make utility to
-rebuild the kernel.  See Step 3 for rebuilding the kernel.
-
-If your Linux does not include the cs89x0 driver, you need to edit three 
-configuration files, copy the source file to the /usr/src/linux/drivers/net
-directory, and then run the make utility to rebuild the kernel.
-
-1. Edit the following configuration files by adding the statements as
-indicated.  (When possible, try to locate the added text to the section of the
-file containing similar statements).
-
-
-a.) In /usr/src/linux/drivers/net/Config.in, add:
-
-tristate 'CS89x0 support' CONFIG_CS89x0
-
-Example:
-
-     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-       tristate 'ICL EtherTeam 16i/32 support' CONFIG_ETH16I
-     fi
-
-     tristate 'CS89x0 support' CONFIG_CS89x0
-
-     tristate 'NE2000/NE1000 support' CONFIG_NE2000
-     if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
-       tristate 'NI5210 support' CONFIG_NI52
-
-
-b.) In /usr/src/linux/drivers/net/Makefile, add the following lines: 
-
-ifeq ($(CONFIG_CS89x0),y)
-L_OBJS += cs89x0.o
-else
-  ifeq ($(CONFIG_CS89x0),m)
-  M_OBJS += cs89x0.o
-  endif
-endif
-
-
-c.) In /linux/drivers/net/Space.c file, add the line:
-
-extern int cs89x0_probe(struct device *dev);
-
-
-Example:
-
- extern int ultra_probe(struct device *dev);
- extern int wd_probe(struct device *dev);
- extern int el2_probe(struct device *dev);
-
- extern int cs89x0_probe(struct device *dev);
-
- extern int ne_probe(struct device *dev);
- extern int hp_probe(struct device *dev);
- extern int hp_plus_probe(struct device *dev);
-
-
-Also add:
-
- #ifdef CONFIG_CS89x0
-        { cs89x0_probe,0 },
- #endif
-
-
-2.) Copy the driver source files (cs89x0.c and cs89x0.h) 
-into the /usr/src/linux/drivers/net directory.
-
-
-3.) Go to /usr/src/linux directory and run 'make config' followed by 'make' 
-(or make bzImage) to rebuild the kernel. 
-
-4.) Use the DOS 'setup' utility to disable plug and play on the NIC.
-
 
 5.0 TESTING AND TROUBLESHOOTING
 ===============================================================================
diff --git a/Documentation/networking/depca.txt b/Documentation/networking/depca.txt
deleted file mode 100644
index 24c6b26e5658..000000000000
--- a/Documentation/networking/depca.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-
-DE10x
-=====
-
-Memory Addresses:
-
-        SW1     SW2     SW3     SW4
-64K     on      on      on      on      d0000   dbfff
-        off     on      on      on      c0000   cbfff
-        off     off     on      on      e0000   ebfff
-
-32K     on      on      off     on      d8000   dbfff
-        off     on      off     on      c8000   cbfff
-        off     off     off     on      e8000   ebfff
-
-DBR ROM on      on                      dc000   dffff
-        off     on                      cc000   cffff
-        off     off                     ec000   effff
-
-Note  that the 2K  mode   is set  by   SW3/SW4  on/off or  off/off.  Address
-assignment is through the RBSA register.
-
-I/O Address:
-        SW5
-0x300   on
-0x200   off
-
-Remote Boot:
-        SW6
-Disable on
-Enable  off
-
-Remote Boot Timeout:
-        SW7
-2.5min  on
-30s     off
-
-IRQ:
-        SW8     SW9     SW10    SW11    SW12
-2       on      off     off     off     off
-3       off     on      off     off     off
-4       off     off     on      off     off
-5       off     off     off     on      off
-7       off     off     off     off     on
-
-DE20x
-=====
-
-Memory Size:
-
-        SW3     SW4
-64K     on      on
-32K     off     on
-2K      on      off
-2K      off     off
-
-Start Addresses:
-
-        SW1     SW2     SW3     SW4
-64K     on      on      on      on      c0000   cffff
-        on      off     on      on      d0000   dffff
-        off     on      on      on      e0000   effff
-
-32K     on      on      off     off     c8000   cffff
-        on      off     off     off     d8000   dffff
-        off     on      off     off     e8000   effff
-
-Illegal off     off      -       -        -       -
-
-I/O Address:
-        SW5
-0x300   on
-0x200   off
-
-Remote Boot:
-        SW6
-Disable on
-Enable  off
-
-Remote Boot Timeout:
-        SW7
-2.5min  on
-30s     off
-
-IRQ:
-        SW8     SW9     SW10    SW11    SW12
-5       on      off     off     off     off
-9       off     on      off     off     off
-10      off     off     on      off     off
-11      off     off     off     on      off
-15      off     off     off     off     on
-
diff --git a/Documentation/networking/ewrk3.txt b/Documentation/networking/ewrk3.txt
deleted file mode 100644
index 90e9e5f16e6b..000000000000
--- a/Documentation/networking/ewrk3.txt
+++ /dev/null
@@ -1,46 +0,0 @@
-The EtherWORKS 3  driver in this distribution is  designed to  work with all
-kernels   >  1.1.33   (approx)  and  includes  tools   in  the  'ewrk3tools'
-subdirectory   to  allow  set   up of   the   card,  similar  to  the  MSDOS
-'NICSETUP.EXE' tools provided on  the DOS drivers  disk (type 'make' in that
-subdirectory to make the tools).
-
-The supported  cards are DE203,  DE204 and DE205.  All   other cards are NOT
-supported - refer to 'depca.c' for running the LANCE based network cards and
-'de4x5.c'  for the  DIGITAL   Semiconductor PCI  chip  based  adapters  from
-Digital.
-
-The ability to load  this driver as a  loadable module has been included and
-used extensively  during the driver  development (to save those  long reboot
-sequences). To utilise this ability, you have to do 8 things:
-
-    0) have a copy of the loadable modules code installed on your system.
-    1) copy ewrk3.c from the  /linux/drivers/net directory to your favourite
-    temporary directory.
-    2) edit the  source code near  line 1898 to reflect  the I/O address and
-    IRQ you're using.
-    3) compile  ewrk3.c, but include -DMODULE in  the command line to ensure
-    that the correct bits are compiled (see end of source code).
-    4) if you are wanting to add a new  card, goto 5. Otherwise, recompile a
-    kernel with the ewrk3 configuration turned off and reboot.
-    5) insmod ewrk3.o
-          [Alan Cox: Changed this so you can insmod ewrk3.o irq=x io=y]
-          [Adam Kropelin: Multiple cards now supported by irq=x1,x2 io=y1,y2]
-    6) run the net startup bits for your new eth?? interface manually 
-    (usually /etc/rc.inet[12] at boot time). 
-    7) enjoy!
-
-    Note that autoprobing is not allowed in loadable modules - the system is
-    already up and running and you're messing with interrupts.
-
-    To unload a module, turn off the associated interface 
-    'ifconfig eth?? down' then 'rmmod ewrk3'.
-
-The performance we've  achieved so far  has been measured through the 'ttcp'
-tool   at 975kB/s.  This  measures  the  total  TCP  stack performance which
-includes the   card,  so don't  expect   to get   much nearer  the  1.25MB/s
-theoretical Ethernet rate.
-
-
-Enjoy!
-
-Dave
diff --git a/Documentation/networking/filter.txt b/Documentation/networking/filter.txt
index bbf2005270b5..cdb3e40b9d14 100644
--- a/Documentation/networking/filter.txt
+++ b/Documentation/networking/filter.txt
@@ -17,12 +17,12 @@ creating filters.
 
 LSF is much simpler than BPF. One does not have to worry about
 devices or anything like that. You simply create your filter
-code, send it to the kernel via the SO_ATTACH_FILTER ioctl and
+code, send it to the kernel via the SO_ATTACH_FILTER option and
 if your filter code passes the kernel check on it, you then
 immediately begin filtering data on that socket.
 
 You can also detach filters from your socket via the
-SO_DETACH_FILTER ioctl. This will probably not be used much
+SO_DETACH_FILTER option. This will probably not be used much
 since when you close a socket that has a filter on it the
 filter is automagically removed. The other less common case
 may be adding a different filter on the same socket where you had another
@@ -31,12 +31,19 @@ the old one and placing your new one in its place, assuming your
 filter has passed the checks, otherwise if it fails the old filter
 will remain on that socket.
 
+SO_LOCK_FILTER option allows to lock the filter attached to a
+socket. Once set, a filter cannot be removed or changed. This allows
+one process to setup a socket, attach a filter, lock it then drop
+privileges and be assured that the filter will be kept until the
+socket is closed.
+
 Examples
 ========
 
 Ioctls-
 setsockopt(sockfd, SOL_SOCKET, SO_ATTACH_FILTER, &Filter, sizeof(Filter));
 setsockopt(sockfd, SOL_SOCKET, SO_DETACH_FILTER, &value, sizeof(value));
+setsockopt(sockfd, SOL_SOCKET, SO_LOCK_FILTER, &value, sizeof(value));
 
 See the BSD bpf.4 manpage and the BSD Packet Filter paper written by
 Steven McCanne and Van Jacobson of Lawrence Berkeley Laboratory.
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index dbca66182089..dc2dc87d2557 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -26,6 +26,11 @@ route/max_size - INTEGER
         Maximum number of routes allowed in the kernel.  Increase
         this when using large numbers of interfaces and/or routes.
 
+neigh/default/gc_thresh1 - INTEGER
+        Minimum number of entries to keep.  Garbage collector will not
+        purge entries if there are fewer than this number.
+        Default: 256
+
 neigh/default/gc_thresh3 - INTEGER
         Maximum number of neighbor entries allowed.  Increase this
         when using large numbers of interfaces and when communicating
@@ -125,17 +130,6 @@ somaxconn - INTEGER
         Defaults to 128.  See also tcp_max_syn_backlog for additional tuning
         for TCP sockets.
 
-tcp_abc - INTEGER
-        Controls Appropriate Byte Count (ABC) defined in RFC3465.
-        ABC is a way of increasing congestion window (cwnd) more slowly
-        in response to partial acknowledgments.
-        Possible values are:
-                0 increase cwnd once per acknowledgment (no ABC)
-                1 increase cwnd once per acknowledgment of full sized segment
-                2 allow increase cwnd by two if acknowledgment is
-                  of two segments to compensate for delayed acknowledgments.
-        Default: 0 (off)
-
 tcp_abort_on_overflow - BOOLEAN
         If listening service is too slow to accept new connections,
         reset them. Default state is FALSE. It means that if overflow
@@ -214,7 +208,8 @@ tcp_ecn - INTEGER
         congestion before having to drop packets.
         Possible values are:
                 0 Disable ECN.  Neither initiate nor accept ECN.
-                1 Always request ECN on outgoing connection attempts.
+                1 Enable ECN when requested by incoming connections and
+                  also request ECN on outgoing connection attempts.
                 2 Enable ECN when requested by incoming connections
                   but do not request ECN on outgoing connections.
         Default: 2
diff --git a/Documentation/networking/multicast.txt b/Documentation/networking/multicast.txt
deleted file mode 100644
index b06c8c69266f..000000000000
--- a/Documentation/networking/multicast.txt
+++ /dev/null
@@ -1,63 +0,0 @@
-Behaviour of Cards Under Multicast
-==================================
-
-This is how they currently behave, not what the hardware can do--for example,
-the Lance driver doesn't use its filter, even though the code for loading
-it is in the DEC Lance-based driver.
-
-The following are requirements for multicasting 
------------------------------------------------
-AppleTalk       Multicast       hardware filtering not important but
-                                 avoid cards only doing promisc
-IP-Multicast    Multicast       hardware filters really help
-IP-MRoute       AllMulti        hardware filters are of no help
-
-
-Board           Multicast       AllMulti        Promisc         Filter
-------------------------------------------------------------------------
-3c501           YES             YES             YES             Software
-3c503           YES             YES             YES             Hardware
-3c505           YES             NO              YES             Hardware
-3c507           NO              NO              NO              N/A
-3c509           YES             YES             YES             Software
-3c59x           YES             YES             YES             Software
-ac3200          YES             YES             YES             Hardware
-apricot         YES             PROMISC         YES             Hardware
-arcnet          NO              NO              NO              N/A
-at1700          PROMISC         PROMISC         YES             Software
-atp             PROMISC         PROMISC         YES             Software
-cs89x0          YES             YES             YES             Software
-de4x5           YES             YES             YES             Hardware
-de600           NO              NO              NO              N/A
-de620           PROMISC         PROMISC         YES             Software
-depca           YES             PROMISC         YES             Hardware
-dmfe            YES             YES             YES             Software(*)
-e2100           YES             YES             YES             Hardware
-eepro           YES             PROMISC         YES             Hardware
-eexpress        NO              NO              NO              N/A
-ewrk3           YES             PROMISC         YES             Hardware
-hp-plus         YES             YES             YES             Hardware
-hp              YES             YES             YES             Hardware
-hp100           YES             YES             YES             Hardware
-ibmtr           NO              NO              NO              N/A
-ioc3-eth        YES             YES             YES             Hardware
-lance           YES             YES             YES             Software(#)
-ne              YES             YES             YES             Hardware
-ni52            <------------------ Buggy ------------------>
-ni65            YES             YES             YES             Software(#)
-seeq            NO              NO              NO              N/A
-sgiseek         <------------------ Buggy ------------------>
-smc-ultra       YES             YES             YES             Hardware
-sunlance        YES             YES             YES             Hardware
-tulip           YES             YES             YES             Hardware
-wavelan         YES             PROMISC         YES             Hardware
-wd              YES             YES             YES             Hardware
-xirc2ps_cs      YES             YES             YES             Hardware
-znet            YES             YES             YES             Software
-
-
-PROMISC = This multicast mode is in fact promiscuous mode. Avoid using
-cards who go PROMISC on any multicast in a multicast kernel.
-
-(#) = Hardware multicast support is not used yet.
-(*) = Hardware support for Davicom 9132 chipset only.
diff --git a/Documentation/networking/netconsole.txt b/Documentation/networking/netconsole.txt
index 2e9e0ae2cd45..a5d574a9ae09 100644
--- a/Documentation/networking/netconsole.txt
+++ b/Documentation/networking/netconsole.txt
@@ -1,9 +1,10 @@
 
 started by Ingo Molnar <mingo@redhat.com>, 2001.09.17
 2.6 port and netpoll api by Matt Mackall <mpm@selenic.com>, Sep 9 2003
+IPv6 support by Cong Wang <xiyou.wangcong@gmail.com>, Jan 1 2013
 
 Please send bug reports to Matt Mackall <mpm@selenic.com>
-and Satyam Sharma <satyam.sharma@gmail.com>
+Satyam Sharma <satyam.sharma@gmail.com>, and Cong Wang <xiyou.wangcong@gmail.com>
 
 Introduction:
 =============
@@ -41,6 +42,10 @@ Examples:
 
  insmod netconsole netconsole=@/,@10.0.0.2/
 
+  or using IPv6
+
+ insmod netconsole netconsole=@/,@fd00:1:2:3::1/
+
 It also supports logging to multiple remote agents by specifying
 parameters for the multiple agents separated by semicolons and the
 complete string enclosed in "quotes", thusly:
diff --git a/Documentation/networking/nf_conntrack-sysctl.txt b/Documentation/networking/nf_conntrack-sysctl.txt
new file mode 100644
index 000000000000..70da5086153d
--- /dev/null
+++ b/Documentation/networking/nf_conntrack-sysctl.txt
@@ -0,0 +1,176 @@
+/proc/sys/net/netfilter/nf_conntrack_* Variables:
+
+nf_conntrack_acct - BOOLEAN
+        0 - disabled (default)
+        not 0 - enabled
+
+        Enable connection tracking flow accounting. 64-bit byte and packet
+        counters per flow are added.
+
+nf_conntrack_buckets - INTEGER (read-only)
+        Size of hash table. If not specified as parameter during module
+        loading, the default size is calculated by dividing total memory
+        by 16384 to determine the number of buckets but the hash table will
+        never have fewer than 32 or more than 16384 buckets.
+
+nf_conntrack_checksum - BOOLEAN
+        0 - disabled
+        not 0 - enabled (default)
+
+        Verify checksum of incoming packets. Packets with bad checksums are
+        in INVALID state. If this is enabled, such packets will not be
+        considered for connection tracking.
+
+nf_conntrack_count - INTEGER (read-only)
+        Number of currently allocated flow entries.
+
+nf_conntrack_events - BOOLEAN
+        0 - disabled
+        not 0 - enabled (default)
+
+        If this option is enabled, the connection tracking code will
+        provide userspace with connection tracking events via ctnetlink.
+
+nf_conntrack_events_retry_timeout - INTEGER (seconds)
+        default 15
+
+        This option is only relevant when "reliable connection tracking
+        events" are used.  Normally, ctnetlink is "lossy", that is,
+        events are normally dropped when userspace listeners can't keep up.
+
+        Userspace can request "reliable event mode".  When this mode is
+        active, the conntrack will only be destroyed after the event was
+        delivered.  If event delivery fails, the kernel periodically
+        re-tries to send the event to userspace.
+
+        This is the maximum interval the kernel should use when re-trying
+        to deliver the destroy event.
+
+        A higher number means there will be fewer delivery retries and it
+        will take longer for a backlog to be processed.
+
+nf_conntrack_expect_max - INTEGER
+        Maximum size of expectation table.  Default value is
+        nf_conntrack_buckets / 256. Minimum is 1.
+
+nf_conntrack_frag6_high_thresh - INTEGER
+        default 262144
+
+        Maximum memory used to reassemble IPv6 fragments.  When
+        nf_conntrack_frag6_high_thresh bytes of memory is allocated for this
+        purpose, the fragment handler will toss packets until
+        nf_conntrack_frag6_low_thresh is reached.
+
+nf_conntrack_frag6_low_thresh - INTEGER
+        default 196608
+
+        See nf_conntrack_frag6_low_thresh
+
+nf_conntrack_frag6_timeout - INTEGER (seconds)
+        default 60
+
+        Time to keep an IPv6 fragment in memory.
+
+nf_conntrack_generic_timeout - INTEGER (seconds)
+        default 600
+
+        Default for generic timeout.  This refers to layer 4 unknown/unsupported
+        protocols.
+
+nf_conntrack_helper - BOOLEAN
+        0 - disabled
+        not 0 - enabled (default)
+
+        Enable automatic conntrack helper assignment.
+
+nf_conntrack_icmp_timeout - INTEGER (seconds)
+        default 30
+
+        Default for ICMP timeout.
+
+nf_conntrack_icmpv6_timeout - INTEGER (seconds)
+        default 30
+
+        Default for ICMP6 timeout.
+
+nf_conntrack_log_invalid - INTEGER
+        0   - disable (default)
+        1   - log ICMP packets
+        6   - log TCP packets
+        17  - log UDP packets
+        33  - log DCCP packets
+        41  - log ICMPv6 packets
+        136 - log UDPLITE packets
+        255 - log packets of any protocol
+
+        Log invalid packets of a type specified by value.
+
+nf_conntrack_max - INTEGER
+        Size of connection tracking table.  Default value is
+        nf_conntrack_buckets value * 4.
+
+nf_conntrack_tcp_be_liberal - BOOLEAN
+        0 - disabled (default)
+        not 0 - enabled
+
+        Be conservative in what you do, be liberal in what you accept from others.
+        If it's non-zero, we mark only out of window RST segments as INVALID.
+
+nf_conntrack_tcp_loose - BOOLEAN
+        0 - disabled
+        not 0 - enabled (default)
+
+        If it is set to zero, we disable picking up already established
+        connections.
+
+nf_conntrack_tcp_max_retrans - INTEGER
+        default 3
+
+        Maximum number of packets that can be retransmitted without
+        received an (acceptable) ACK from the destination. If this number
+        is reached, a shorter timer will be started.
+
+nf_conntrack_tcp_timeout_close - INTEGER (seconds)
+        default 10
+
+nf_conntrack_tcp_timeout_close_wait - INTEGER (seconds)
+        default 60
+
+nf_conntrack_tcp_timeout_established - INTEGER (seconds)
+        default 432000 (5 days)
+
+nf_conntrack_tcp_timeout_fin_wait - INTEGER (seconds)
+        default 120
+
+nf_conntrack_tcp_timeout_last_ack - INTEGER (seconds)
+        default 30
+
+nf_conntrack_tcp_timeout_max_retrans - INTEGER (seconds)
+        default 300
+
+nf_conntrack_tcp_timeout_syn_recv - INTEGER (seconds)
+        default 60
+
+nf_conntrack_tcp_timeout_syn_sent - INTEGER (seconds)
+        default 120
+
+nf_conntrack_tcp_timeout_time_wait - INTEGER (seconds)
+        default 120
+
+nf_conntrack_tcp_timeout_unacknowledged - INTEGER (seconds)
+        default 300
+
+nf_conntrack_timestamp - BOOLEAN
+        0 - disabled (default)
+        not 0 - enabled
+
+        Enable connection tracking flow timestamping.
+
+nf_conntrack_udp_timeout - INTEGER (seconds)
+        default 30
+
+nf_conntrack_udp_timeout_stream2 - INTEGER (seconds)
+        default 180
+
+        This extended timeout will be used in case there is an UDP stream
+        detected.
diff --git a/Documentation/networking/operstates.txt b/Documentation/networking/operstates.txt
index 1a77a3cfae54..97694572338b 100644
--- a/Documentation/networking/operstates.txt
+++ b/Documentation/networking/operstates.txt
@@ -88,6 +88,10 @@ set this flag. On netif_carrier_off(), the scheduler stops sending
 packets. The name 'carrier' and the inversion are historical, think of
 it as lower layer.
 
+Note that for certain kind of soft-devices, which are not managing any
+real hardware, there is possible to set this bit from userpsace.
+One should use TVL IFLA_CARRIER to do so.
+
 netif_carrier_ok() can be used to query that bit.
 
 __LINK_STATE_DORMANT, maps to IFF_DORMANT:
diff --git a/Documentation/networking/phy.txt b/Documentation/networking/phy.txt
index 95e5f5985a2a..d5b1a3935245 100644
--- a/Documentation/networking/phy.txt
+++ b/Documentation/networking/phy.txt
@@ -103,7 +103,7 @@ Letting the PHY Abstraction Layer do Everything
  
  Now, to connect, just call this function:
  
-   phydev = phy_connect(dev, phy_name, &adjust_link, flags, interface);
+   phydev = phy_connect(dev, phy_name, &adjust_link, interface);
 
  phydev is a pointer to the phy_device structure which represents the PHY.  If
  phy_connect is successful, it will return the pointer.  dev, here, is the
@@ -113,7 +113,9 @@ Letting the PHY Abstraction Layer do Everything
  current state, though the PHY will not yet be truly operational at this
  point.
 
- flags is a u32 which can optionally contain phy-specific flags.
+ PHY-specific flags should be set in phydev->dev_flags prior to the call
+ to phy_connect() such that the underlying PHY driver can check for flags
+ and perform specific operations based on them.
  This is useful if the system has put hardware restrictions on
  the PHY/controller, of which the PHY needs to be aware.
 
@@ -185,11 +187,10 @@ Doing it all yourself
    start, or disables then frees them for stop.
 
  struct phy_device * phy_attach(struct net_device *dev, const char *phy_id,
-                 u32 flags, phy_interface_t interface);
+                 phy_interface_t interface);
 
    Attaches a network device to a particular PHY, binding the PHY to a generic
-   driver if none was found during bus initialization.  Passes in
-   any phy-specific flags as needed.
+   driver if none was found during bus initialization.
 
  int phy_start_aneg(struct phy_device *phydev);
    
diff --git a/Documentation/nfc/nfc-hci.txt b/Documentation/nfc/nfc-hci.txt
index 89a339c9b079..0686c9e211c2 100644
--- a/Documentation/nfc/nfc-hci.txt
+++ b/Documentation/nfc/nfc-hci.txt
@@ -17,10 +17,12 @@ HCI
 HCI registers as an nfc device with NFC Core. Requests coming from userspace are
 routed through netlink sockets to NFC Core and then to HCI. From this point,
 they are translated in a sequence of HCI commands sent to the HCI layer in the
-host controller (the chip). The sending context blocks while waiting for the
-response to arrive.
+host controller (the chip). Commands can be executed synchronously (the sending
+context blocks waiting for response) or asynchronously (the response is returned
+from HCI Rx context).
 HCI events can also be received from the host controller. They will be handled
-and a translation will be forwarded to NFC Core as needed.
+and a translation will be forwarded to NFC Core as needed. There are hooks to
+let the HCI driver handle proprietary events or override standard behavior.
 HCI uses 2 execution contexts:
 - one for executing commands : nfc_hci_msg_tx_work(). Only one command
 can be executing at any given moment.
@@ -33,6 +35,8 @@ The Session initialization is an HCI standard which must unfortunately
 support proprietary gates. This is the reason why the driver will pass a list
 of proprietary gates that must be part of the session. HCI will ensure all
 those gates have pipes connected when the hci device is set up.
+In case the chip supports pre-opened gates and pseudo-static pipes, the driver
+can pass that information to HCI core.
 
 HCI Gates and Pipes
 -------------------
@@ -46,6 +50,13 @@ without knowing the pipe connected to it.
 Driver interface
 ----------------
 
+A driver is generally written in two parts : the physical link management and
+the HCI management. This makes it easier to maintain a driver for a chip that
+can be connected using various phy (i2c, spi, ...)
+
+HCI Management
+--------------
+
 A driver would normally register itself with HCI and provide the following
 entry points:
 
@@ -53,58 +64,113 @@ struct nfc_hci_ops {
         int (*open)(struct nfc_hci_dev *hdev);
         void (*close)(struct nfc_hci_dev *hdev);
         int (*hci_ready) (struct nfc_hci_dev *hdev);
-        int (*xmit)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
-        int (*start_poll)(struct nfc_hci_dev *hdev, u32 protocols);
-        int (*target_from_gate)(struct nfc_hci_dev *hdev, u8 gate,
-                                struct nfc_target *target);
+        int (*xmit) (struct nfc_hci_dev *hdev, struct sk_buff *skb);
+        int (*start_poll) (struct nfc_hci_dev *hdev,
+                           u32 im_protocols, u32 tm_protocols);
+        int (*dep_link_up)(struct nfc_hci_dev *hdev, struct nfc_target *target,
+                           u8 comm_mode, u8 *gb, size_t gb_len);
+        int (*dep_link_down)(struct nfc_hci_dev *hdev);
+        int (*target_from_gate) (struct nfc_hci_dev *hdev, u8 gate,
+                                 struct nfc_target *target);
         int (*complete_target_discovered) (struct nfc_hci_dev *hdev, u8 gate,
                                            struct nfc_target *target);
-        int (*data_exchange) (struct nfc_hci_dev *hdev,
-                              struct nfc_target *target,
-                              struct sk_buff *skb, struct sk_buff **res_skb);
+        int (*im_transceive) (struct nfc_hci_dev *hdev,
+                              struct nfc_target *target, struct sk_buff *skb,
+                              data_exchange_cb_t cb, void *cb_context);
+        int (*tm_send)(struct nfc_hci_dev *hdev, struct sk_buff *skb);
         int (*check_presence)(struct nfc_hci_dev *hdev,
                               struct nfc_target *target);
+        int (*event_received)(struct nfc_hci_dev *hdev, u8 gate, u8 event,
+                              struct sk_buff *skb);
 };
 
 - open() and close() shall turn the hardware on and off.
 - hci_ready() is an optional entry point that is called right after the hci
 session has been set up. The driver can use it to do additional initialization
 that must be performed using HCI commands.
-- xmit() shall simply write a frame to the chip.
+- xmit() shall simply write a frame to the physical link.
 - start_poll() is an optional entrypoint that shall set the hardware in polling
 mode. This must be implemented only if the hardware uses proprietary gates or a
 mechanism slightly different from the HCI standard.
+- dep_link_up() is called after a p2p target has been detected, to finish
+the p2p connection setup with hardware parameters that need to be passed back
+to nfc core.
+- dep_link_down() is called to bring the p2p link down.
 - target_from_gate() is an optional entrypoint to return the nfc protocols
 corresponding to a proprietary gate.
 - complete_target_discovered() is an optional entry point to let the driver
 perform additional proprietary processing necessary to auto activate the
 discovered target.
-- data_exchange() must be implemented by the driver if proprietary HCI commands
+- im_transceive() must be implemented by the driver if proprietary HCI commands
 are required to send data to the tag. Some tag types will require custom
 commands, others can be written to using the standard HCI commands. The driver
 can check the tag type and either do proprietary processing, or return 1 to ask
-for standard processing.
+for standard processing. The data exchange command itself must be sent
+asynchronously.
+- tm_send() is called to send data in the case of a p2p connection
 - check_presence() is an optional entry point that will be called regularly
 by the core to check that an activated tag is still in the field. If this is
 not implemented, the core will not be able to push tag_lost events to the user
 space
+- event_received() is called to handle an event coming from the chip. Driver
+can handle the event or return 1 to let HCI attempt standard processing.
 
 On the rx path, the driver is responsible to push incoming HCP frames to HCI
 using nfc_hci_recv_frame(). HCI will take care of re-aggregation and handling
 This must be done from a context that can sleep.
 
-SHDLC
------
+PHY Management
+--------------
+
+The physical link (i2c, ...) management is defined by the following struture:
+
+struct nfc_phy_ops {
+        int (*write)(void *dev_id, struct sk_buff *skb);
+        int (*enable)(void *dev_id);
+        void (*disable)(void *dev_id);
+};
+
+enable(): turn the phy on (power on), make it ready to transfer data
+disable(): turn the phy off
+write(): Send a data frame to the chip. Note that to enable higher
+layers such as an llc to store the frame for re-emission, this function must
+not alter the skb. It must also not return a positive result (return 0 for
+success, negative for failure).
+
+Data coming from the chip shall be sent directly to nfc_hci_recv_frame().
+
+LLC
+---
+
+Communication between the CPU and the chip often requires some link layer
+protocol. Those are isolated as modules managed by the HCI layer. There are
+currently two modules : nop (raw transfert) and shdlc.
+A new llc must implement the following functions:
+
+struct nfc_llc_ops {
+        void *(*init) (struct nfc_hci_dev *hdev, xmit_to_drv_t xmit_to_drv,
+                       rcv_to_hci_t rcv_to_hci, int tx_headroom,
+                       int tx_tailroom, int *rx_headroom, int *rx_tailroom,
+                       llc_failure_t llc_failure);
+        void (*deinit) (struct nfc_llc *llc);
+        int (*start) (struct nfc_llc *llc);
+        int (*stop) (struct nfc_llc *llc);
+        void (*rcv_from_drv) (struct nfc_llc *llc, struct sk_buff *skb);
+        int (*xmit_from_hci) (struct nfc_llc *llc, struct sk_buff *skb);
+};
+
+- init() : allocate and init your private storage
+- deinit() : cleanup
+- start() : establish the logical connection
+- stop () : terminate the logical connection
+- rcv_from_drv() : handle data coming from the chip, going to HCI
+- xmit_from_hci() : handle data sent by HCI, going to the chip
 
-Most chips use shdlc to ensure integrity and delivery ordering of the HCP
-frames between the host controller (the chip) and hosts (entities connected
-to the chip, like the cpu). In order to simplify writing the driver, an shdlc
-layer is available for use by the driver.
-When used, the driver actually registers with shdlc, and shdlc will register
-with HCI. HCI sees shdlc as the driver and thus send its HCP frames
-through shdlc->xmit.
-SHDLC adds a new execution context (nfc_shdlc_sm_work()) to run its state
-machine and handle both its rx and tx path.
+The llc must be registered with nfc before it can be used. Do that by
+calling nfc_llc_register(const char *name, struct nfc_llc_ops *ops);
+
+Again, note that the llc does not handle the physical link. It is thus very
+easy to mix any physical link with any llc for a given chip driver.
 
 Included Drivers
 ----------------
@@ -117,10 +183,12 @@ Execution Contexts
 
 The execution contexts are the following:
 - IRQ handler (IRQH):
-fast, cannot sleep. stores incoming frames into an shdlc rx queue
+fast, cannot sleep. sends incoming frames to HCI where they are passed to
+the current llc. In case of shdlc, the frame is queued in shdlc rx queue.
 
 - SHDLC State Machine worker (SMW)
-handles shdlc rx & tx queues. Dispatches HCI cmd responses.
+Only when llc_shdlc is used: handles shdlc rx & tx queues.
+Dispatches HCI cmd responses.
 
 - HCI Tx Cmd worker (MSGTXWQ)
 Serializes execution of HCI commands. Completes execution in case of response
@@ -166,6 +234,15 @@ waiting command execution. Response processing involves invoking the completion
 callback that was provided by nfc_hci_msg_tx_work() when it sent the command.
 The completion callback will then wake the syscall context.
 
+It is also possible to execute the command asynchronously using this API:
+
+static int nfc_hci_execute_cmd_async(struct nfc_hci_dev *hdev, u8 pipe, u8 cmd,
+                               const u8 *param, size_t param_len,
+                               data_exchange_cb_t cb, void *cb_context)
+
+The workflow is the same, except that the API call returns immediately, and
+the callback will be called with the result from the SMW context.
+
 Workflow receiving an HCI event or command
 ------------------------------------------
 
diff --git a/Documentation/nfc/nfc-pn544.txt b/Documentation/nfc/nfc-pn544.txt
index 2fcac9f5996e..b36ca14ca2d6 100644
--- a/Documentation/nfc/nfc-pn544.txt
+++ b/Documentation/nfc/nfc-pn544.txt
@@ -1,32 +1,15 @@
 Kernel driver for the NXP Semiconductors PN544 Near Field
 Communication chip
 
-Author: Jari Vanhala
-Contact: Matti Aaltonen (matti.j.aaltonen at nokia.com)
-
 General
 -------
 
 The PN544 is an integrated transmission module for contactless
 communication. The driver goes under drives/nfc/ and is compiled as a
-module named "pn544". It registers a misc device and creates a device
-file named "/dev/pn544".
+module named "pn544".
 
 Host Interfaces: I2C, SPI and HSU, this driver supports currently only I2C.
 
-The Interface
--------------
-
-The driver offers a sysfs interface for a hardware test and an IOCTL
-interface for selecting between two operating modes. There are read,
-write and poll functions for transferring messages. The two operating
-modes are the normal (HCI) mode and the firmware update mode.
-
-PN544 is controlled by sending messages from the userspace to the
-chip. The main function of the driver is just to pass those messages
-without caring about the message content.
-
-
 Protocols
 ---------
 
@@ -47,68 +30,3 @@ and third (LSB) bytes of the message. The maximum FW message length is
 
 For the ETSI HCI specification see
 http://www.etsi.org/WebSite/Technologies/ProtocolSpecification.aspx
-
-The Hardware Test
------------------
-
-The idea of the test is that it can performed by reading from the
-corresponding sysfs file. The test is implemented in the board file
-and it should test that PN544 can be put into the firmware update
-mode. If the test is not implemented the sysfs file does not get
-created.
-
-Example:
-> cat /sys/module/pn544/drivers/i2c\:pn544/3-002b/nfc_test
-1
-
-Normal Operation
-----------------
-
-PN544 is powered up when the device file is opened, otherwise it's
-turned off. Only one instance can use the device at a time.
-
-Userspace applications control PN544 with HCI messages. The hardware
-sends an interrupt when data is available for reading. Data is
-physically read when the read function is called by a userspace
-application. Poll() checks the read interrupt state. Configuration and
-self testing are also done from the userspace using read and write.
-
-Example platform data:
-
-static int rx71_pn544_nfc_request_resources(struct i2c_client *client)
-{
-        /* Get and setup the HW resources for the device */
-}
-
-static void rx71_pn544_nfc_free_resources(void)
-{
-        /* Release the HW resources */
-}
-
-static void rx71_pn544_nfc_enable(int fw)
-{
-        /* Turn the device on */
-}
-
-static int rx71_pn544_nfc_test(void)
-{
-        /*
-         * Put the device into the FW update mode
-         * and then back to the normal mode.
-         * Check the behavior and return one on success,
-         * zero on failure.
-         */
-}
-
-static void rx71_pn544_nfc_disable(void)
-{
-        /* turn the power off */
-}
-
-static struct pn544_nfc_platform_data rx71_nfc_data = {
-        .request_resources = rx71_pn544_nfc_request_resources,
-        .free_resources = rx71_pn544_nfc_free_resources,
-        .enable = rx71_pn544_nfc_enable,
-        .test = rx71_pn544_nfc_test,
-        .disable = rx71_pn544_nfc_disable,
-};
diff --git a/Documentation/zh_CN/magic-number.txt b/Documentation/zh_CN/magic-number.txt
index 4263022f5002..2ebe539f5450 100644
--- a/Documentation/zh_CN/magic-number.txt
+++ b/Documentation/zh_CN/magic-number.txt
@@ -122,7 +122,7 @@ SLAB_C_MAGIC          0x4f17a36d  kmem_cache        mm/slab.c
 COW_MAGIC             0x4f4f4f4d  cow_header_v1     arch/um/drivers/ubd_user.c
 I810_CARD_MAGIC       0x5072696E  i810_card         sound/oss/i810_audio.c
 TRIDENT_CARD_MAGIC    0x5072696E  trident_card      sound/oss/trident.c
-ROUTER_MAGIC          0x524d4157  wan_device        include/linux/wanrouter.h
+ROUTER_MAGIC          0x524d4157  wan_device        [in wanrouter.h pre 3.9]
 SCC_MAGIC             0x52696368  gs_port           drivers/char/scc.h
 SAVEKMSG_MAGIC1       0x53415645  savekmsg          arch/*/amiga/config.c
 GDA_MAGIC             0x58464552  gda               arch/mips/include/asm/sn/gda.h