From 5d467f84435f5bd6f7bbb61aeaea5f0af5b9a886 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 9 Aug 2014 05:03:26 +0200 Subject: [PATCH] ethtool: update to 3.15, add licensing information The ixp4xx patch is removed as I couldn't find any information about a driver with this name, neither in the OpenWrt kernel nor upstream. If anybody knows that it was actually useful after all, please tell me... Signed-off-by: Matthias Schiffer --- net/ethtool/Makefile | 7 +- net/ethtool/patches/100-ixp4xx.patch | 166 --------------------------- 2 files changed, 5 insertions(+), 168 deletions(-) delete mode 100644 net/ethtool/patches/100-ixp4xx.patch diff --git a/net/ethtool/Makefile b/net/ethtool/Makefile index 1f2cea167..7fa772aed 100644 --- a/net/ethtool/Makefile +++ b/net/ethtool/Makefile @@ -8,13 +8,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ethtool -PKG_VERSION:=3.14 +PKG_VERSION:=3.15 PKG_RELEASE:=1 PKG_MAINTAINER:=Matthias Schiffer PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/ethtool -PKG_MD5SUM:=d46b809ddd672b51d7e23787ae9122e0 +PKG_MD5SUM:=e7bf0c355d2bf6ee281ebc713c5fb987 + +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILE:=COPYING PKG_FIXUP:=autoreconf PKG_INSTALL:=1 diff --git a/net/ethtool/patches/100-ixp4xx.patch b/net/ethtool/patches/100-ixp4xx.patch deleted file mode 100644 index 48c011920..000000000 --- a/net/ethtool/patches/100-ixp4xx.patch +++ /dev/null @@ -1,166 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -13,7 +13,7 @@ ethtool_SOURCES += \ - fec_8xx.c ibm_emac.c ixgb.c ixgbe.c natsemi.c \ - pcnet32.c realtek.c tg3.c marvell.c vioc.c \ - smsc911x.c at76c50x-usb.c sfc.c stmmac.c \ -- sfpid.c sfpdiag.c ixgbevf.c -+ sfpid.c sfpdiag.c ixgbevf.c ixp4xx.c - endif - - TESTS = test-cmdline test-features ---- a/ethtool.c -+++ b/ethtool.c -@@ -894,6 +894,7 @@ static const struct { - { "ixgb", ixgb_dump_regs }, - { "ixgbe", ixgbe_dump_regs }, - { "ixgbevf", ixgbevf_dump_regs }, -+ { "ixp4xx", ixp4xx_dump_regs }, - { "natsemi", natsemi_dump_regs }, - { "e100", e100_dump_regs }, - { "amd8111e", amd8111e_dump_regs }, ---- a/internal.h -+++ b/internal.h -@@ -243,6 +243,9 @@ int st_gmac_dump_regs(struct ethtool_drv - /* Et131x ethernet controller */ - int et131x_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); - -+/* Intel IXP4xx internal MAC */ -+int ixp4xx_dump_regs(struct ethtool_drvinfo *info, struct ethtool_regs *regs); -+ - /* Rx flow classification */ - int rxclass_parse_ruleopts(struct cmd_context *ctx, - struct ethtool_rx_flow_spec *fsp); ---- /dev/null -+++ b/ixp4xx.c -@@ -0,0 +1,130 @@ -+/* -+ * Copyright (c) 2006 Christian Hohnstaed -+ * This file is released under the GPLv2 -+ */ -+ -+#include -+#include "internal.h" -+ -+#ifndef BIT -+#define BIT(x) (1<data; -+ -+ fprintf(stdout, -+ "TXctrl: 0x%02x:0x%02x\n" -+ " Enable: %s\n" -+ " Duplex: %s\n" -+ " Retry: %s (%d)\n" -+ " Padding: %s\n" -+ " Frame check: %s\n" -+ " TX deferral: %s\n" -+ " Connection: %s\n" -+ "\n", -+ data[0], data[1], -+ data[0] & TX_CNTRL1_TX_EN ? "yes" : "no", -+ data[0] & TX_CNTRL1_DUPLEX ? "half" : "full", -+ data[0] & TX_CNTRL1_RETRY ? "enabled" : "disabled", -+ data[1] & TX_CNTRL2_RETRIES_MASK, -+ data[0] & TX_CNTRL1_PAD_EN ? "enabled" : "disabled", -+ data[0] & TX_CNTRL1_FCS_EN ? "enabled" : "disabled", -+ data[0] & TX_CNTRL1_2DEFER ? "two-part" : "one-part", -+ data[0] & TX_CNTRL1_RMII ? "RMII" : "Full MII" -+ ); -+ -+ fprintf(stdout, -+ "RXctrl: 0x%02x\n" -+ " Enable: %s\n" -+ " Pad strip: %s\n" -+ " CRC check: %s\n" -+ " Pause: %s\n" -+ " Loop: %s\n" -+ " Promiscous: %s\n" -+ " Runt frames: %s\n" -+ " Broadcast: %s\n" -+ "\n", -+ data[2], -+ data[2] & RX_CNTRL1_RX_EN ? "yes" : "no", -+ data[2] & RX_CNTRL1_PADSTRIP_EN ? "enabled" : "disabled", -+ data[2] & RX_CNTRL1_CRC_EN ? "enabled" : "disabled", -+ data[2] & RX_CNTRL1_PAUSE_EN ? "enabled" : "disabled", -+ data[2] & RX_CNTRL1_LOOP_EN ? "enabled" : "disabled", -+ data[2] & RX_CNTRL1_ADDR_FLTR_EN ? "disabled" : "enabled", -+ data[2] & RX_CNTRL1_RX_RUNT_EN ? "forward" : "discard", -+ data[2] & RX_CNTRL1_BCAST_DIS ? "disabled" : "enabled" -+ ); -+ fprintf(stdout, -+ "Core control: 0x%02x\n" -+ " Core state: %s\n" -+ " RX fifo: %s\n" -+ " TX fifo: %s\n" -+ " Send jam: %s\n" -+ " MDC clock %s\n" -+ "\n", -+ data[32], -+ data[32] & CORE_RESET ? "reset" : "normal operation", -+ data[32] & CORE_RX_FIFO_FLUSH ? "flush" : "ok", -+ data[32] & CORE_TX_FIFO_FLUSH ? "flush" : "ok", -+ data[32] & CORE_SEND_JAM ? "yes" : "no", -+ data[32] & CORE_MDC_EN ? "output" : "input" -+ ); -+ fprintf(stdout, -+ "MAC addresses: \n" -+ " Multicast mask: " MAC "\n" -+ " Multicast address: " MAC "\n" -+ " Unicast address: " MAC "\n" -+ "\n", -+ MAC_DATA(data+13), MAC_DATA(data+19), MAC_DATA(data+26) -+ ); -+ fprintf(stdout, -+ "Random seed: 0x%02x\n" -+ "Threshold empty: %3d\n" -+ "Threshold full: %3d\n" -+ "TX buffer size: %3d\n" -+ "TX deferral: %3d\n" -+ "RX deferral: %3d\n" -+ "TX two deferral 1: %3d\n" -+ "TX two deferral 2: %3d\n" -+ "Slot time: %3d\n" -+ "Internal clock: %3d\n" -+ "\n", -+ data[4], data[5], data[6], data[7], data[8], data[9], -+ data[10], data[11], data[12], data[25] -+ ); -+ -+ return 0; -+}