Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a9a7a57 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'stmmac-cleanups' 



Corentin Labbe says:

====================
net: stmmac: misc fix

I am currently working on dwmac-sun8i glue driver for Allwinner H3/A83T/A64.
This series is the result of all minor problem found in the stmmac driver.

All patch are tested on cubieboard2 via dwmac-sunxi and on pine64/orangepis via dwmac-sun8i.

Changes since v1:
- Removed netdev_dbg() in "net: stmmac: print phy information"
- Removed patch "net: stmmac: Implement NAPI for TX", it will be reworked
- Changed error message in "Correct the error message about invalid speed"
- Added some acked-by
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c502faf9 a6a3e026

drivers/net/ethernet/stmicro/stmmac/chain_mode.c

+0 −4
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".

drivers/net/ethernet/stmicro/stmmac/common.h

+2 −6
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".
@@ -71,7 +67,7 @@ struct stmmac_extra_stats { 
	unsigned long overflow_error;

	unsigned long ipc_csum_error;

	unsigned long rx_collision;

	unsigned long rx_crc;

	unsigned long rx_crc_errors;

	unsigned long dribbling_bit;

	unsigned long rx_length;

	unsigned long rx_mii;
@@ -343,7 +339,7 @@ struct dma_features { 
/* Common MAC defines */

#define MAC_CTRL_REG		0x00000000	/* MAC Control */

#define MAC_ENABLE_TX		0x00000008	/* Transmitter Enable */

#define MAC_RNABLE_RX		0x00000004	/* Receiver Enable */

#define MAC_ENABLE_RX		0x00000004	/* Receiver Enable */



/* Default LPI timers */

#define STMMAC_DEFAULT_LIT_LS	0x3E8

drivers/net/ethernet/stmicro/stmmac/descs.h

+0 −4
Original line number Diff line number Diff line
@@ -11,10 +11,6 @@ 
  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".

drivers/net/ethernet/stmicro/stmmac/descs_com.h

+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".

drivers/net/ethernet/stmicro/stmmac/dwmac100.h

+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ 
  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.,

  51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.



  The full GNU General Public License is included in this distribution in

  the file called "COPYING".