From e9c69a2cc69f5d14123c2abc12680a997767d83e Mon Sep 17 00:00:00 2001 From: Giuseppe CAVALLARO Date: Tue, 18 Oct 2011 00:01:20 +0000 Subject: [PATCH] --- yaml --- r: 266875 b: refs/heads/master c: 51e3137b9b6113c7e12cf0a0dc82238854a86712 h: refs/heads/master i: 266873: 22818333990412e3c42d6095aec4f170a9b3aab9 266871: d2d4db57b3ca2a0caa64426048b19b54f894a2ce v: v3 --- [refs] | 2 +- trunk/Documentation/networking/stmmac.txt | 11 ++++++++++- trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6c904d4ca02f..60521de9bf4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9097a9666fd7b08fd2a152b2a0b6c8d48639bb2 +refs/heads/master: 51e3137b9b6113c7e12cf0a0dc82238854a86712 diff --git a/trunk/Documentation/networking/stmmac.txt b/trunk/Documentation/networking/stmmac.txt index 40ec92ce4c84..8d67980fabe8 100644 --- a/trunk/Documentation/networking/stmmac.txt +++ b/trunk/Documentation/networking/stmmac.txt @@ -76,7 +76,16 @@ core. 4.5) DMA descriptors Driver handles both normal and enhanced descriptors. The latter has been only -tested on DWC Ether MAC 10/100/1000 Universal version 3.41a. +tested on DWC Ether MAC 10/100/1000 Universal version 3.41a and later. + +STMMAC supports DMA descriptor to operate both in dual buffer (RING) +and linked-list(CHAINED) mode. In RING each descriptor points to two +data buffer pointers whereas in CHAINED mode they point to only one data +buffer pointer. RING mode is the default. + +In CHAINED mode each descriptor will have pointer to next descriptor in +the list, hence creating the explicit chaining in the descriptor itself, +whereas such explicit chaining is not possible in RING mode. 4.6) Ethtool support Ethtool is supported. Driver statistics and internal errors can be taken using: diff --git a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h index 50e95d87857a..49a4af3ce3a8 100644 --- a/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h +++ b/trunk/drivers/net/ethernet/stmicro/stmmac/stmmac.h @@ -20,7 +20,7 @@ Author: Giuseppe Cavallaro *******************************************************************************/ -#define DRV_MODULE_VERSION "Aug_2011" +#define DRV_MODULE_VERSION "Oct_2011" #include #include "common.h"