8 files changed, 498 insertions, 47 deletions

diff --git a/Documentation/ABI/testing/sysfs-class-net-mesh b/Documentation/ABI/testing/sysfs-class-net-mesh
index bc41da61608d..bdcd8b4e38f2 100644
--- a/Documentation/ABI/testing/sysfs-class-net-mesh
+++ b/Documentation/ABI/testing/sysfs-class-net-mesh
@@ -67,6 +67,14 @@ Description:
                 Defines the penalty which will be applied to an
                 originator message's tq-field on every hop.
 
+What:           /sys/class/net/<mesh_iface>/mesh/network_coding
+Date:           Nov 2012
+Contact:        Martin Hundeboll <martin@hundeboll.net>
+Description:
+                Controls whether Network Coding (using some magic
+                to send fewer wifi packets but still the same
+                content) is enabled or not.
+
 What:           /sys/class/net/<mesh_iface>/mesh/orig_interval
 Date:           May 2010
 Contact:        Marek Lindner <lindner_marek@yahoo.de>
diff --git a/Documentation/devicetree/bindings/net/can/atmel-can.txt b/Documentation/devicetree/bindings/net/can/atmel-can.txt
new file mode 100644
index 000000000000..72cf0c5daff4
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/can/atmel-can.txt
@@ -0,0 +1,14 @@
+* AT91 CAN *
+
+Required properties:
+  - compatible: Should be "atmel,at91sam9263-can" or "atmel,at91sam9x5-can"
+  - reg: Should contain CAN controller registers location and length
+  - interrupts: Should contain IRQ line for the CAN controller
+
+Example:
+
+        can0: can@f000c000 {
+                compatbile = "atmel,at91sam9x5-can";
+                reg = <0xf000c000 0x300>;
+                interrupts = <40 4 5>
+        };
diff --git a/Documentation/devicetree/bindings/net/cpsw.txt b/Documentation/devicetree/bindings/net/cpsw.txt
index ecfdf756d10f..4f2ca6b4a182 100644
--- a/Documentation/devicetree/bindings/net/cpsw.txt
+++ b/Documentation/devicetree/bindings/net/cpsw.txt
@@ -15,16 +15,22 @@ Required properties:
 - mac_control           : Specifies Default MAC control register content
                           for the specific platform
 - slaves                : Specifies number for slaves
-- cpts_active_slave     : Specifies the slave to use for time stamping
+- active_slave          : Specifies the slave to use for time stamping,
+                          ethtool and SIOCGMIIPHY
 - cpts_clock_mult       : Numerator to convert input clock ticks into nanoseconds
 - cpts_clock_shift      : Denominator to convert input clock ticks into nanoseconds
-- phy_id                : Specifies slave phy id
-- mac-address           : Specifies slave MAC address
 
 Optional properties:
 - ti,hwmods             : Must be "cpgmac0"
 - no_bd_ram             : Must be 0 or 1
 - dual_emac             : Specifies Switch to act as Dual EMAC
+
+Slave Properties:
+Required properties:
+- phy_id                : Specifies slave phy id
+- mac-address           : Specifies slave MAC address
+
+Optional properties:
 - 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
@@ -47,7 +53,7 @@ Examples:
                 rx_descs = <64>;
                 mac_control = <0x20>;
                 slaves = <2>;
-                cpts_active_slave = <0>;
+                active_slave = <0>;
                 cpts_clock_mult = <0x80000000>;
                 cpts_clock_shift = <29>;
                 cpsw_emac0: slave@0 {
@@ -73,7 +79,7 @@ Examples:
                 rx_descs = <64>;
                 mac_control = <0x20>;
                 slaves = <2>;
-                cpts_active_slave = <0>;
+                active_slave = <0>;
                 cpts_clock_mult = <0x80000000>;
                 cpts_clock_shift = <29>;
                 cpsw_emac0: slave@0 {
diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.txt b/Documentation/devicetree/bindings/net/dsa/dsa.txt
new file mode 100644
index 000000000000..49f4f7ae3f51
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/dsa/dsa.txt
@@ -0,0 +1,91 @@
+Marvell Distributed Switch Architecture Device Tree Bindings
+------------------------------------------------------------
+
+Required properties:
+- compatible            : Should be "marvell,dsa"
+- #address-cells        : Must be 2, first cell is the address on the MDIO bus
+                          and second cell is the address in the switch tree.
+                          Second cell is used only when cascading/chaining.
+- #size-cells           : Must be 0
+- dsa,ethernet          : Should be a phandle to a valid Ethernet device node
+- dsa,mii-bus           : Should be a phandle to a valid MDIO bus device node
+
+Optionnal properties:
+- interrupts            : property with a value describing the switch
+                          interrupt number (not supported by the driver)
+
+A DSA node can contain multiple switch chips which are therefore child nodes of
+the parent DSA node. The maximum number of allowed child nodes is 4
+(DSA_MAX_SWITCHES).
+Each of these switch child nodes should have the following required properties:
+
+- reg                   : Describes the switch address on the MII bus
+- #address-cells        : Must be 1
+- #size-cells           : Must be 0
+
+A switch may have multiple "port" children nodes
+
+Each port children node must have the following mandatory properties:
+- reg                   : Describes the port address in the switch
+- label                 : Describes the label associated with this port, special
+                          labels are "cpu" to indicate a CPU port and "dsa" to
+                          indicate an uplink/downlink port.
+
+Note that a port labelled "dsa" will imply checking for the uplink phandle
+described below.
+
+Optionnal property:
+- link                  : Should be a phandle to another switch's DSA port.
+                          This property is only used when switches are being
+                          chained/cascaded together.
+
+Example:
+
+        dsa@0 {
+                compatible = "marvell,dsa";
+                #address-cells = <2>;
+                #size-cells = <0>;
+
+                interrupts = <10>;
+                dsa,ethernet = <&ethernet0>;
+                dsa,mii-bus = <&mii_bus0>;
+
+                switch@0 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <16 0>;   /* MDIO address 16, switch 0 in tree */
+
+                        port@0 {
+                                reg = <0>;
+                                label = "lan1";
+                        };
+
+                        port@1 {
+                                reg = <1>;
+                                label = "lan2";
+                        };
+
+                        port@5 {
+                                reg = <5>;
+                                label = "cpu";
+                        };
+
+                        switch0uplink: port@6 {
+                                reg = <6>;
+                                label = "dsa";
+                                link = <&switch1uplink>;
+                        };
+                };
+
+                switch@1 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <17 1>;   /* MDIO address 17, switch 1 in tree */
+
+                        switch1uplink: port@0 {
+                                reg = <0>;
+                                label = "dsa";
+                                link = <&switch0uplink>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt b/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
index 34e7aafa321c..052b5f28a624 100644
--- a/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
+++ b/Documentation/devicetree/bindings/net/marvell-orion-mdio.txt
@@ -9,6 +9,9 @@ Required properties:
 - compatible: "marvell,orion-mdio"
 - reg: address and length of the SMI register
 
+Optional properties:
+- interrupts: interrupt line number for the SMI error/done interrupt
+
 The child nodes of the MDIO driver are the individual PHY devices
 connected to this MDIO bus. They must have a "reg" property given the
 PHY address on the MDIO bus.
diff --git a/Documentation/networking/ip-sysctl.txt b/Documentation/networking/ip-sysctl.txt
index dc2dc87d2557..f98ca633b528 100644
--- a/Documentation/networking/ip-sysctl.txt
+++ b/Documentation/networking/ip-sysctl.txt
@@ -29,7 +29,7 @@ route/max_size - INTEGER
 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
+        Default: 128
 
 neigh/default/gc_thresh3 - INTEGER
         Maximum number of neighbor entries allowed.  Increase this
@@ -175,14 +175,6 @@ tcp_congestion_control - STRING
         is inherited.
         [see setsockopt(listenfd, SOL_TCP, TCP_CONGESTION, "name" ...) ]
 
-tcp_cookie_size - INTEGER
-        Default size of TCP Cookie Transactions (TCPCT) option, that may be
-        overridden on a per socket basis by the TCPCT socket option.
-        Values greater than the maximum (16) are interpreted as the maximum.
-        Values greater than zero and less than the minimum (8) are interpreted
-        as the minimum.  Odd values are interpreted as the next even value.
-        Default: 0 (off).
-
 tcp_dsack - BOOLEAN
         Allows TCP to send "duplicate" SACKs.
 
@@ -190,7 +182,9 @@ tcp_early_retrans - INTEGER
         Enable Early Retransmit (ER), per RFC 5827. ER lowers the threshold
         for triggering fast retransmit when the amount of outstanding data is
         small and when no previously unsent data can be transmitted (such
-        that limited transmit could be used).
+        that limited transmit could be used). Also controls the use of
+        Tail loss probe (TLP) that converts RTOs occuring due to tail
+        losses into fast recovery (draft-dukkipati-tcpm-tcp-loss-probe-01).
         Possible values:
                 0 disables ER
                 1 enables ER
@@ -198,7 +192,9 @@ tcp_early_retrans - INTEGER
                   by a fourth of RTT. This mitigates connection falsely
                   recovers when network has a small degree of reordering
                   (less than 3 packets).
-        Default: 2
+                3 enables delayed ER and TLP.
+                4 enables TLP only.
+        Default: 3
 
 tcp_ecn - INTEGER
         Control use of Explicit Congestion Notification (ECN) by TCP.
@@ -229,36 +225,13 @@ tcp_fin_timeout - INTEGER
         Default: 60 seconds
 
 tcp_frto - INTEGER
-        Enables Forward RTO-Recovery (F-RTO) defined in RFC4138.
+        Enables Forward RTO-Recovery (F-RTO) defined in RFC5682.
         F-RTO is an enhanced recovery algorithm for TCP retransmission
-        timeouts.  It is particularly beneficial in wireless environments
-        where packet loss is typically due to random radio interference
-        rather than intermediate router congestion.  F-RTO is sender-side
-        only modification. Therefore it does not require any support from
-        the peer.
-
-        If set to 1, basic version is enabled.  2 enables SACK enhanced
-        F-RTO if flow uses SACK.  The basic version can be used also when
-        SACK is in use though scenario(s) with it exists where F-RTO
-        interacts badly with the packet counting of the SACK enabled TCP
-        flow.
-
-tcp_frto_response - INTEGER
-        When F-RTO has detected that a TCP retransmission timeout was
-        spurious (i.e, the timeout would have been avoided had TCP set a
-        longer retransmission timeout), TCP has several options what to do
-        next. Possible values are:
-                0 Rate halving based; a smooth and conservative response,
-                  results in halved cwnd and ssthresh after one RTT
-                1 Very conservative response; not recommended because even
-                  though being valid, it interacts poorly with the rest of
-                  Linux TCP, halves cwnd and ssthresh immediately
-                2 Aggressive response; undoes congestion control measures
-                  that are now known to be unnecessary (ignoring the
-                  possibility of a lost retransmission that would require
-                  TCP to be more cautious), cwnd and ssthresh are restored
-                  to the values prior timeout
-        Default: 0 (rate halving based)
+        timeouts.  It is particularly beneficial in networks where the
+        RTT fluctuates (e.g., wireless). F-RTO is sender-side only
+        modification. It does not require any support from the peer.
+
+        By default it's enabled with a non-zero value. 0 disables F-RTO.
 
 tcp_keepalive_time - INTEGER
         How often TCP sends out keepalive messages when keepalive is enabled.
diff --git a/Documentation/networking/packet_mmap.txt b/Documentation/networking/packet_mmap.txt
index 94444b152fbc..65efb85e49de 100644
--- a/Documentation/networking/packet_mmap.txt
+++ b/Documentation/networking/packet_mmap.txt
@@ -685,6 +685,333 @@ int main(int argc, char **argp)
 }
 
 -------------------------------------------------------------------------------
++ AF_PACKET TPACKET_V3 example
+-------------------------------------------------------------------------------
+
+AF_PACKET's TPACKET_V3 ring buffer can be configured to use non-static frame
+sizes by doing it's own memory management. It is based on blocks where polling
+works on a per block basis instead of per ring as in TPACKET_V2 and predecessor.
+
+It is said that TPACKET_V3 brings the following benefits:
+ *) ~15 - 20% reduction in CPU-usage
+ *) ~20% increase in packet capture rate
+ *) ~2x increase in packet density
+ *) Port aggregation analysis
+ *) Non static frame size to capture entire packet payload
+
+So it seems to be a good candidate to be used with packet fanout.
+
+Minimal example code by Daniel Borkmann based on Chetan Loke's lolpcap (compile
+it with gcc -Wall -O2 blob.c, and try things like "./a.out eth0", etc.):
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <assert.h>
+#include <net/if.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <poll.h>
+#include <unistd.h>
+#include <signal.h>
+#include <inttypes.h>
+#include <sys/socket.h>
+#include <sys/mman.h>
+#include <linux/if_packet.h>
+#include <linux/if_ether.h>
+#include <linux/ip.h>
+
+#define BLOCK_SIZE              (1 << 22)
+#define FRAME_SIZE              2048
+
+#define NUM_BLOCKS              64
+#define NUM_FRAMES              ((BLOCK_SIZE * NUM_BLOCKS) / FRAME_SIZE)
+
+#define BLOCK_RETIRE_TOV_IN_MS  64
+#define BLOCK_PRIV_AREA_SZ      13
+
+#define ALIGN_8(x)              (((x) + 8 - 1) & ~(8 - 1))
+
+#define BLOCK_STATUS(x)         ((x)->h1.block_status)
+#define BLOCK_NUM_PKTS(x)       ((x)->h1.num_pkts)
+#define BLOCK_O2FP(x)           ((x)->h1.offset_to_first_pkt)
+#define BLOCK_LEN(x)            ((x)->h1.blk_len)
+#define BLOCK_SNUM(x)           ((x)->h1.seq_num)
+#define BLOCK_O2PRIV(x)         ((x)->offset_to_priv)
+#define BLOCK_PRIV(x)           ((void *) ((uint8_t *) (x) + BLOCK_O2PRIV(x)))
+#define BLOCK_HDR_LEN           (ALIGN_8(sizeof(struct block_desc)))
+#define BLOCK_PLUS_PRIV(sz_pri) (BLOCK_HDR_LEN + ALIGN_8((sz_pri)))
+
+#ifndef likely
+# define likely(x)              __builtin_expect(!!(x), 1)
+#endif
+#ifndef unlikely
+# define unlikely(x)            __builtin_expect(!!(x), 0)
+#endif
+
+struct block_desc {
+        uint32_t version;
+        uint32_t offset_to_priv;
+        struct tpacket_hdr_v1 h1;
+};
+
+struct ring {
+        struct iovec *rd;
+        uint8_t *map;
+        struct tpacket_req3 req;
+};
+
+static unsigned long packets_total = 0, bytes_total = 0;
+static sig_atomic_t sigint = 0;
+
+void sighandler(int num)
+{
+        sigint = 1;
+}
+
+static int setup_socket(struct ring *ring, char *netdev)
+{
+        int err, i, fd, v = TPACKET_V3;
+        struct sockaddr_ll ll;
+
+        fd = socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
+        if (fd < 0) {
+                perror("socket");
+                exit(1);
+        }
+
+        err = setsockopt(fd, SOL_PACKET, PACKET_VERSION, &v, sizeof(v));
+        if (err < 0) {
+                perror("setsockopt");
+                exit(1);
+        }
+
+        memset(&ring->req, 0, sizeof(ring->req));
+        ring->req.tp_block_size = BLOCK_SIZE;
+        ring->req.tp_frame_size = FRAME_SIZE;
+        ring->req.tp_block_nr = NUM_BLOCKS;
+        ring->req.tp_frame_nr = NUM_FRAMES;
+        ring->req.tp_retire_blk_tov = BLOCK_RETIRE_TOV_IN_MS;
+        ring->req.tp_sizeof_priv = BLOCK_PRIV_AREA_SZ;
+        ring->req.tp_feature_req_word |= TP_FT_REQ_FILL_RXHASH;
+
+        err = setsockopt(fd, SOL_PACKET, PACKET_RX_RING, &ring->req,
+                         sizeof(ring->req));
+        if (err < 0) {
+                perror("setsockopt");
+                exit(1);
+        }
+
+        ring->map = mmap(NULL, ring->req.tp_block_size * ring->req.tp_block_nr,
+                         PROT_READ | PROT_WRITE, MAP_SHARED | MAP_LOCKED,
+                         fd, 0);
+        if (ring->map == MAP_FAILED) {
+                perror("mmap");
+                exit(1);
+        }
+
+        ring->rd = malloc(ring->req.tp_block_nr * sizeof(*ring->rd));
+        assert(ring->rd);
+        for (i = 0; i < ring->req.tp_block_nr; ++i) {
+                ring->rd[i].iov_base = ring->map + (i * ring->req.tp_block_size);
+                ring->rd[i].iov_len = ring->req.tp_block_size;
+        }
+
+        memset(&ll, 0, sizeof(ll));
+        ll.sll_family = PF_PACKET;
+        ll.sll_protocol = htons(ETH_P_ALL);
+        ll.sll_ifindex = if_nametoindex(netdev);
+        ll.sll_hatype = 0;
+        ll.sll_pkttype = 0;
+        ll.sll_halen = 0;
+
+        err = bind(fd, (struct sockaddr *) &ll, sizeof(ll));
+        if (err < 0) {
+                perror("bind");
+                exit(1);
+        }
+
+        return fd;
+}
+
+#ifdef __checked
+static uint64_t prev_block_seq_num = 0;
+
+void assert_block_seq_num(struct block_desc *pbd)
+{
+        if (unlikely(prev_block_seq_num + 1 != BLOCK_SNUM(pbd))) {
+                printf("prev_block_seq_num:%"PRIu64", expected seq:%"PRIu64" != "
+                       "actual seq:%"PRIu64"\n", prev_block_seq_num,
+                       prev_block_seq_num + 1, (uint64_t) BLOCK_SNUM(pbd));
+                exit(1);
+        }
+
+        prev_block_seq_num = BLOCK_SNUM(pbd);
+}
+
+static void assert_block_len(struct block_desc *pbd, uint32_t bytes, int block_num)
+{
+        if (BLOCK_NUM_PKTS(pbd)) {
+                if (unlikely(bytes != BLOCK_LEN(pbd))) {
+                        printf("block:%u with %upackets, expected len:%u != actual len:%u\n",
+                               block_num, BLOCK_NUM_PKTS(pbd), bytes, BLOCK_LEN(pbd));
+                        exit(1);
+                }
+        } else {
+                if (unlikely(BLOCK_LEN(pbd) != BLOCK_PLUS_PRIV(BLOCK_PRIV_AREA_SZ))) {
+                        printf("block:%u, expected len:%lu != actual len:%u\n",
+                               block_num, BLOCK_HDR_LEN, BLOCK_LEN(pbd));
+                        exit(1);
+                }
+        }
+}
+
+static void assert_block_header(struct block_desc *pbd, const int block_num)
+{
+        uint32_t block_status = BLOCK_STATUS(pbd);
+
+        if (unlikely((block_status & TP_STATUS_USER) == 0)) {
+                printf("block:%u, not in TP_STATUS_USER\n", block_num);
+                exit(1);
+        }
+
+        assert_block_seq_num(pbd);
+}
+#else
+static inline void assert_block_header(struct block_desc *pbd, const int block_num)
+{
+}
+static void assert_block_len(struct block_desc *pbd, uint32_t bytes, int block_num)
+{
+}
+#endif
+
+static void display(struct tpacket3_hdr *ppd)
+{
+        struct ethhdr *eth = (struct ethhdr *) ((uint8_t *) ppd + ppd->tp_mac);
+        struct iphdr *ip = (struct iphdr *) ((uint8_t *) eth + ETH_HLEN);
+
+        if (eth->h_proto == htons(ETH_P_IP)) {
+                struct sockaddr_in ss, sd;
+                char sbuff[NI_MAXHOST], dbuff[NI_MAXHOST];
+
+                memset(&ss, 0, sizeof(ss));
+                ss.sin_family = PF_INET;
+                ss.sin_addr.s_addr = ip->saddr;
+                getnameinfo((struct sockaddr *) &ss, sizeof(ss),
+                            sbuff, sizeof(sbuff), NULL, 0, NI_NUMERICHOST);
+
+                memset(&sd, 0, sizeof(sd));
+                sd.sin_family = PF_INET;
+                sd.sin_addr.s_addr = ip->daddr;
+                getnameinfo((struct sockaddr *) &sd, sizeof(sd),
+                            dbuff, sizeof(dbuff), NULL, 0, NI_NUMERICHOST);
+
+                printf("%s -> %s, ", sbuff, dbuff);
+        }
+
+        printf("rxhash: 0x%x\n", ppd->hv1.tp_rxhash);
+}
+
+static void walk_block(struct block_desc *pbd, const int block_num)
+{
+        int num_pkts = BLOCK_NUM_PKTS(pbd), i;
+        unsigned long bytes = 0;
+        unsigned long bytes_with_padding = BLOCK_PLUS_PRIV(BLOCK_PRIV_AREA_SZ);
+        struct tpacket3_hdr *ppd;
+
+        assert_block_header(pbd, block_num);
+
+        ppd = (struct tpacket3_hdr *) ((uint8_t *) pbd + BLOCK_O2FP(pbd));
+        for (i = 0; i < num_pkts; ++i) {
+                bytes += ppd->tp_snaplen;
+                if (ppd->tp_next_offset)
+                        bytes_with_padding += ppd->tp_next_offset;
+                else
+                        bytes_with_padding += ALIGN_8(ppd->tp_snaplen + ppd->tp_mac);
+
+                display(ppd);
+
+                ppd = (struct tpacket3_hdr *) ((uint8_t *) ppd + ppd->tp_next_offset);
+                __sync_synchronize();
+        }
+
+        assert_block_len(pbd, bytes_with_padding, block_num);
+
+        packets_total += num_pkts;
+        bytes_total += bytes;
+}
+
+void flush_block(struct block_desc *pbd)
+{
+        BLOCK_STATUS(pbd) = TP_STATUS_KERNEL;
+        __sync_synchronize();
+}
+
+static void teardown_socket(struct ring *ring, int fd)
+{
+        munmap(ring->map, ring->req.tp_block_size * ring->req.tp_block_nr);
+        free(ring->rd);
+        close(fd);
+}
+
+int main(int argc, char **argp)
+{
+        int fd, err;
+        socklen_t len;
+        struct ring ring;
+        struct pollfd pfd;
+        unsigned int block_num = 0;
+        struct block_desc *pbd;
+        struct tpacket_stats_v3 stats;
+
+        if (argc != 2) {
+                fprintf(stderr, "Usage: %s INTERFACE\n", argp[0]);
+                return EXIT_FAILURE;
+        }
+
+        signal(SIGINT, sighandler);
+
+        memset(&ring, 0, sizeof(ring));
+        fd = setup_socket(&ring, argp[argc - 1]);
+        assert(fd > 0);
+
+        memset(&pfd, 0, sizeof(pfd));
+        pfd.fd = fd;
+        pfd.events = POLLIN | POLLERR;
+        pfd.revents = 0;
+
+        while (likely(!sigint)) {
+                pbd = (struct block_desc *) ring.rd[block_num].iov_base;
+retry_block:
+                if ((BLOCK_STATUS(pbd) & TP_STATUS_USER) == 0) {
+                        poll(&pfd, 1, -1);
+                        goto retry_block;
+                }
+
+                walk_block(pbd, block_num);
+                flush_block(pbd);
+                block_num = (block_num + 1) % NUM_BLOCKS;
+        }
+
+        len = sizeof(stats);
+        err = getsockopt(fd, SOL_PACKET, PACKET_STATISTICS, &stats, &len);
+        if (err < 0) {
+                perror("getsockopt");
+                exit(1);
+        }
+
+        fflush(stdout);
+        printf("\nReceived %u packets, %lu bytes, %u dropped, freeze_q_cnt: %u\n",
+               stats.tp_packets, bytes_total, stats.tp_drops,
+               stats.tp_freeze_q_cnt);
+
+        teardown_socket(&ring, fd);
+        return 0;
+}
+
+-------------------------------------------------------------------------------
 + PACKET_TIMESTAMP
 -------------------------------------------------------------------------------
 
diff --git a/Documentation/networking/stmmac.txt b/Documentation/networking/stmmac.txt
index f9fa6db40a52..8efe0b3c8b83 100644
--- a/Documentation/networking/stmmac.txt
+++ b/Documentation/networking/stmmac.txt
@@ -326,6 +326,35 @@ To enter in Tx LPI mode the driver needs to have a software timer
 that enable and disable the LPI mode when there is nothing to be
 transmitted.
 
-7) TODO:
+7) Extended descriptors
+The extended descriptors give us information about the receive Ethernet payload
+when it is carrying PTP packets or TCP/UDP/ICMP over IP.
+These are not available on GMAC Synopsys chips older than the 3.50.
+At probe time the driver will decide if these can be actually used.
+This support also is mandatory for PTPv2 because the extra descriptors 6 and 7
+are used for saving the hardware timestamps.
+
+8) Precision Time Protocol (PTP)
+The driver supports the IEEE 1588-2002, Precision Time Protocol (PTP),
+which enables precise synchronization of clocks in measurement and
+control systems implemented with technologies such as network
+communication.
+
+In addition to the basic timestamp features mentioned in IEEE 1588-2002
+Timestamps, new GMAC cores support the advanced timestamp features.
+IEEE 1588-2008 that can be enabled when configure the Kernel.
+
+9) SGMII/RGMII supports
+New GMAC devices provide own way to manage RGMII/SGMII.
+This information is available at run-time by looking at the
+HW capability register. This means that the stmmac can manage
+auto-negotiation and link status w/o using the PHYLIB stuff
+In fact, the HW provides a subset of extended registers to
+restart the ANE, verify Full/Half duplex mode and Speed.
+Also thanks to these registers it is possible to look at the
+Auto-negotiated Link Parter Ability.
+
+10) TODO:
  o XGMAC is not supported.
- o Add the PTP - precision time protocol
+ o Complete the TBI & RTBI support.
+ o extened VLAN support for 3.70a SYNP GMAC.