mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-18 23:12:59 +02:00
Merge remote-tracking branch 'origin/seventeen' into seventeen
This commit is contained in:
Michael Tremer
@@ -2803,8 +2803,8 @@ CONFIG_SENSORS_ATXP1=m
|
||||
CONFIG_SENSORS_DS620=m
|
||||
CONFIG_SENSORS_DS1621=m
|
||||
CONFIG_SENSORS_I5K_AMB=m
|
||||
CONFIG_SENSORS_F71805F=m
|
||||
CONFIG_SENSORS_F71882FG=m
|
||||
# CONFIG_SENSORS_F71805F is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
CONFIG_SENSORS_F75375S=m
|
||||
CONFIG_SENSORS_G760A=m
|
||||
CONFIG_SENSORS_G762=m
|
||||
@@ -2816,7 +2816,7 @@ CONFIG_SENSORS_HTU21=m
|
||||
CONFIG_SENSORS_IBMAEM=m
|
||||
CONFIG_SENSORS_IBMPEX=m
|
||||
# CONFIG_SENSORS_IIO_HWMON is not set
|
||||
CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
# CONFIG_SENSORS_JC42 is not set
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LM63=y
|
||||
@@ -2847,10 +2847,10 @@ CONFIG_SENSORS_MAX6642=m
|
||||
CONFIG_SENSORS_MAX6650=m
|
||||
CONFIG_SENSORS_MAX6697=m
|
||||
CONFIG_SENSORS_MCP3021=m
|
||||
CONFIG_SENSORS_NCT6775=m
|
||||
# CONFIG_SENSORS_NCT6775 is not set
|
||||
CONFIG_SENSORS_NTC_THERMISTOR=m
|
||||
CONFIG_SENSORS_PC87360=m
|
||||
CONFIG_SENSORS_PC87427=m
|
||||
# CONFIG_SENSORS_PC87360 is not set
|
||||
# CONFIG_SENSORS_PC87427 is not set
|
||||
CONFIG_SENSORS_PCF8591=m
|
||||
CONFIG_PMBUS=m
|
||||
CONFIG_SENSORS_PMBUS=m
|
||||
@@ -2867,16 +2867,16 @@ CONFIG_SENSORS_SHT15=m
|
||||
CONFIG_SENSORS_SHT21=m
|
||||
CONFIG_SENSORS_SIS5595=m
|
||||
# CONFIG_SENSORS_SMM665 is not set
|
||||
CONFIG_SENSORS_DME1737=m
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
CONFIG_SENSORS_EMC1403=m
|
||||
# CONFIG_SENSORS_EMC2103 is not set
|
||||
CONFIG_SENSORS_EMC6W201=m
|
||||
CONFIG_SENSORS_SMSC47M1=m
|
||||
# CONFIG_SENSORS_SMSC47M1 is not set
|
||||
CONFIG_SENSORS_SMSC47M192=m
|
||||
CONFIG_SENSORS_SMSC47B397=m
|
||||
CONFIG_SENSORS_SCH56XX_COMMON=m
|
||||
CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
# CONFIG_SENSORS_SMSC47B397 is not set
|
||||
# CONFIG_SENSORS_SCH56XX_COMMON is not set
|
||||
# CONFIG_SENSORS_SCH5627 is not set
|
||||
# CONFIG_SENSORS_SCH5636 is not set
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
CONFIG_SENSORS_ADS7828=m
|
||||
CONFIG_SENSORS_AMC6821=m
|
||||
@@ -2887,7 +2887,7 @@ CONFIG_SENSORS_TMP102=m
|
||||
CONFIG_SENSORS_TMP401=m
|
||||
CONFIG_SENSORS_TMP421=m
|
||||
CONFIG_SENSORS_VIA686A=m
|
||||
CONFIG_SENSORS_VT1211=m
|
||||
# CONFIG_SENSORS_VT1211 is not set
|
||||
CONFIG_SENSORS_VT8231=m
|
||||
CONFIG_SENSORS_W83781D=m
|
||||
CONFIG_SENSORS_W83791D=m
|
||||
@@ -2897,8 +2897,8 @@ CONFIG_SENSORS_W83795=m
|
||||
# CONFIG_SENSORS_W83795_FANCTRL is not set
|
||||
CONFIG_SENSORS_W83L785TS=m
|
||||
CONFIG_SENSORS_W83L786NG=m
|
||||
CONFIG_SENSORS_W83627HF=m
|
||||
CONFIG_SENSORS_W83627EHF=m
|
||||
# CONFIG_SENSORS_W83627HF is not set
|
||||
# CONFIG_SENSORS_W83627EHF is not set
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_HWMON=y
|
||||
CONFIG_THERMAL_OF=y
|
||||
|
||||
@@ -3029,8 +3029,8 @@ CONFIG_SENSORS_ATXP1=m
|
||||
CONFIG_SENSORS_DS620=m
|
||||
CONFIG_SENSORS_DS1621=m
|
||||
# CONFIG_SENSORS_I5K_AMB is not set
|
||||
CONFIG_SENSORS_F71805F=m
|
||||
CONFIG_SENSORS_F71882FG=m
|
||||
# CONFIG_SENSORS_F71805F is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
CONFIG_SENSORS_F75375S=m
|
||||
CONFIG_SENSORS_G760A=m
|
||||
CONFIG_SENSORS_G762=m
|
||||
@@ -3042,7 +3042,7 @@ CONFIG_SENSORS_HTU21=m
|
||||
CONFIG_SENSORS_IBMAEM=m
|
||||
CONFIG_SENSORS_IBMPEX=m
|
||||
# CONFIG_SENSORS_IIO_HWMON is not set
|
||||
CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
# CONFIG_SENSORS_JC42 is not set
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LM63=y
|
||||
@@ -3073,10 +3073,10 @@ CONFIG_SENSORS_MAX6642=m
|
||||
CONFIG_SENSORS_MAX6650=m
|
||||
CONFIG_SENSORS_MAX6697=m
|
||||
CONFIG_SENSORS_MCP3021=m
|
||||
CONFIG_SENSORS_NCT6775=m
|
||||
# CONFIG_SENSORS_NCT6775 is not set
|
||||
CONFIG_SENSORS_NTC_THERMISTOR=m
|
||||
CONFIG_SENSORS_PC87360=m
|
||||
CONFIG_SENSORS_PC87427=m
|
||||
# CONFIG_SENSORS_PC87360 is not set
|
||||
# CONFIG_SENSORS_PC87427 is not set
|
||||
CONFIG_SENSORS_PCF8591=m
|
||||
CONFIG_PMBUS=m
|
||||
CONFIG_SENSORS_PMBUS=m
|
||||
@@ -3093,16 +3093,16 @@ CONFIG_SENSORS_SHT15=m
|
||||
CONFIG_SENSORS_SHT21=m
|
||||
# CONFIG_SENSORS_SIS5595 is not set
|
||||
# CONFIG_SENSORS_SMM665 is not set
|
||||
CONFIG_SENSORS_DME1737=m
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
CONFIG_SENSORS_EMC1403=m
|
||||
# CONFIG_SENSORS_EMC2103 is not set
|
||||
CONFIG_SENSORS_EMC6W201=m
|
||||
CONFIG_SENSORS_SMSC47M1=m
|
||||
# CONFIG_SENSORS_SMSC47M1 is not set
|
||||
CONFIG_SENSORS_SMSC47M192=m
|
||||
CONFIG_SENSORS_SMSC47B397=m
|
||||
CONFIG_SENSORS_SCH56XX_COMMON=m
|
||||
CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
# CONFIG_SENSORS_SMSC47B397 is not set
|
||||
# CONFIG_SENSORS_SCH56XX_COMMON is not set
|
||||
# CONFIG_SENSORS_SCH5627 is not set
|
||||
# CONFIG_SENSORS_SCH5636 is not set
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
CONFIG_SENSORS_ADS7828=m
|
||||
CONFIG_SENSORS_AMC6821=m
|
||||
@@ -3115,7 +3115,7 @@ CONFIG_SENSORS_TMP421=m
|
||||
CONFIG_SENSORS_TWL4030_MADC=m
|
||||
CONFIG_SENSORS_VEXPRESS=m
|
||||
# CONFIG_SENSORS_VIA686A is not set
|
||||
CONFIG_SENSORS_VT1211=m
|
||||
# CONFIG_SENSORS_VT1211 is not set
|
||||
# CONFIG_SENSORS_VT8231 is not set
|
||||
CONFIG_SENSORS_W83781D=m
|
||||
CONFIG_SENSORS_W83791D=m
|
||||
@@ -3125,8 +3125,8 @@ CONFIG_SENSORS_W83795=m
|
||||
# CONFIG_SENSORS_W83795_FANCTRL is not set
|
||||
CONFIG_SENSORS_W83L785TS=m
|
||||
CONFIG_SENSORS_W83L786NG=m
|
||||
CONFIG_SENSORS_W83627HF=m
|
||||
CONFIG_SENSORS_W83627EHF=m
|
||||
# CONFIG_SENSORS_W83627HF is not set
|
||||
# CONFIG_SENSORS_W83627EHF is not set
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_HWMON=y
|
||||
CONFIG_THERMAL_OF=y
|
||||
@@ -5892,7 +5892,7 @@ CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
|
||||
CONFIG_CRYPTO_DEV_OMAP_SHAM=y
|
||||
CONFIG_CRYPTO_DEV_OMAP_AES=y
|
||||
CONFIG_CRYPTO_DEV_SAHARA=y
|
||||
CONFIG_CRYPTO_DEV_SUNXI_SS=m
|
||||
# CONFIG_CRYPTO_DEV_SUNXI_SS is not set
|
||||
CONFIG_ASYMMETRIC_KEY_TYPE=m
|
||||
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m
|
||||
CONFIG_PUBLIC_KEY_ALGO_RSA=m
|
||||
|
||||
@@ -2011,8 +2011,8 @@ CONFIG_SENSORS_ASC7621=m
|
||||
CONFIG_SENSORS_ATXP1=m
|
||||
CONFIG_SENSORS_DS620=m
|
||||
CONFIG_SENSORS_DS1621=m
|
||||
CONFIG_SENSORS_F71805F=m
|
||||
CONFIG_SENSORS_F71882FG=m
|
||||
# CONFIG_SENSORS_F71805F is not set
|
||||
# CONFIG_SENSORS_F71882FG is not set
|
||||
CONFIG_SENSORS_F75375S=m
|
||||
CONFIG_SENSORS_G760A=m
|
||||
CONFIG_SENSORS_G762=m
|
||||
@@ -2021,7 +2021,7 @@ CONFIG_SENSORS_GL520SM=m
|
||||
CONFIG_SENSORS_GPIO_FAN=m
|
||||
CONFIG_SENSORS_HIH6130=m
|
||||
CONFIG_SENSORS_HTU21=m
|
||||
CONFIG_SENSORS_IT87=m
|
||||
# CONFIG_SENSORS_IT87 is not set
|
||||
CONFIG_SENSORS_JC42=m
|
||||
CONFIG_SENSORS_LINEAGE=m
|
||||
CONFIG_SENSORS_LM63=m
|
||||
@@ -2054,10 +2054,10 @@ CONFIG_SENSORS_MAX6642=m
|
||||
CONFIG_SENSORS_MAX6650=m
|
||||
CONFIG_SENSORS_MAX6697=m
|
||||
CONFIG_SENSORS_MCP3021=m
|
||||
CONFIG_SENSORS_NCT6775=m
|
||||
# CONFIG_SENSORS_NCT6775 is not set
|
||||
CONFIG_SENSORS_NTC_THERMISTOR=m
|
||||
CONFIG_SENSORS_PC87360=m
|
||||
CONFIG_SENSORS_PC87427=m
|
||||
# CONFIG_SENSORS_PC87360 is not set
|
||||
# CONFIG_SENSORS_PC87427 is not set
|
||||
CONFIG_SENSORS_PCF8591=m
|
||||
CONFIG_PMBUS=m
|
||||
CONFIG_SENSORS_PMBUS=m
|
||||
@@ -2073,16 +2073,16 @@ CONFIG_SENSORS_ZL6100=m
|
||||
CONFIG_SENSORS_SHT15=m
|
||||
CONFIG_SENSORS_SHT21=m
|
||||
CONFIG_SENSORS_SMM665=m
|
||||
CONFIG_SENSORS_DME1737=m
|
||||
# CONFIG_SENSORS_DME1737 is not set
|
||||
CONFIG_SENSORS_EMC1403=m
|
||||
CONFIG_SENSORS_EMC2103=m
|
||||
CONFIG_SENSORS_EMC6W201=m
|
||||
CONFIG_SENSORS_SMSC47M1=m
|
||||
# CONFIG_SENSORS_SMSC47M1 is not set
|
||||
CONFIG_SENSORS_SMSC47M192=m
|
||||
CONFIG_SENSORS_SMSC47B397=m
|
||||
CONFIG_SENSORS_SCH56XX_COMMON=m
|
||||
CONFIG_SENSORS_SCH5627=m
|
||||
CONFIG_SENSORS_SCH5636=m
|
||||
# CONFIG_SENSORS_SMSC47B397 is not set
|
||||
# CONFIG_SENSORS_SCH56XX_COMMON is not set
|
||||
# CONFIG_SENSORS_SCH5627 is not set
|
||||
# CONFIG_SENSORS_SCH5636 is not set
|
||||
CONFIG_SENSORS_ADS1015=m
|
||||
CONFIG_SENSORS_ADS7828=m
|
||||
CONFIG_SENSORS_ADS7871=m
|
||||
@@ -2093,7 +2093,7 @@ CONFIG_SENSORS_THMC50=m
|
||||
CONFIG_SENSORS_TMP102=m
|
||||
CONFIG_SENSORS_TMP401=m
|
||||
CONFIG_SENSORS_TMP421=m
|
||||
CONFIG_SENSORS_VT1211=m
|
||||
# CONFIG_SENSORS_VT1211 is not set
|
||||
CONFIG_SENSORS_W83781D=m
|
||||
CONFIG_SENSORS_W83791D=m
|
||||
CONFIG_SENSORS_W83792D=m
|
||||
@@ -2102,8 +2102,8 @@ CONFIG_SENSORS_W83795=m
|
||||
# CONFIG_SENSORS_W83795_FANCTRL is not set
|
||||
CONFIG_SENSORS_W83L785TS=m
|
||||
CONFIG_SENSORS_W83L786NG=m
|
||||
CONFIG_SENSORS_W83627HF=m
|
||||
CONFIG_SENSORS_W83627EHF=m
|
||||
# CONFIG_SENSORS_W83627HF is not set
|
||||
# CONFIG_SENSORS_W83627EHF is not set
|
||||
CONFIG_THERMAL=y
|
||||
CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
|
||||
# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
###############################################################################
|
||||
# #
|
||||
# IPFire.org - A linux based firewall #
|
||||
# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
|
||||
# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
# 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 #
|
||||
@@ -31,7 +31,7 @@ TARGET = $(DIR_INFO)/$(THISAPP)
|
||||
|
||||
DEVICE = $(shell losetup -f)
|
||||
PART_BOOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p1
|
||||
PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p2
|
||||
PART_ROOT = /dev/mapper/$(patsubst /dev/%,%,$(DEVICE))p3
|
||||
|
||||
ifeq "$(SCON)" "1"
|
||||
IMAGE_FILE = /install/images/$(SNAME)-$(VERSION).1gb-ext4-scon.$(MACHINE)-full-core$(CORE).img.gz
|
||||
@@ -92,7 +92,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
|
||||
losetup $(DEVICE) $(IMG)
|
||||
|
||||
# Write Partition table
|
||||
echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \
|
||||
echo -e "$(S_OFFSET),$(S_BOOT),$(PART_TYPE),*\n,0,0\n$$(( $(S_BOOT) + $(S_OFFSET) )),$(S_ROOT),L\n" \
|
||||
| sfdisk -D -uS -H 64 -S 32 $(DEVICE)
|
||||
|
||||
kpartx -v -a $(DEVICE)
|
||||
|
||||
@@ -147,7 +147,7 @@ endif
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN-hfcusb-reportl1down.patch
|
||||
|
||||
# Add LED trigger
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.9-ledtrig-netdev-1.patch
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-ledtrig_netdev.patch
|
||||
|
||||
# cs5535audio spams syslog if no ac97 was present (geos router)
|
||||
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.30_cs5535audio_fix_logspam_on_geos.patch
|
||||
|
||||
@@ -21,7 +21,7 @@ case "${1}" in
|
||||
boot_mesg "Re-sizing root partition..."
|
||||
|
||||
# Find root device
|
||||
while read -r dev mountpoint fs options; do
|
||||
mount | while read -r dev tmp1 mountpoint tmp2; do
|
||||
# Skip generic entries
|
||||
[ "${dev}" = "rootfs" ] && continue
|
||||
|
||||
@@ -33,7 +33,7 @@ case "${1}" in
|
||||
rm -f /.resizefs
|
||||
break
|
||||
fi
|
||||
done < /proc/mounts
|
||||
done
|
||||
fi
|
||||
;;
|
||||
|
||||
|
||||
@@ -22,8 +22,14 @@ case "${1}" in
|
||||
mount -o remount,rw / > /dev/null
|
||||
evaluate_retval
|
||||
|
||||
boot_mesg "Create /etc/mtab..."
|
||||
> /etc/mtab
|
||||
mount -f / || failed=1
|
||||
(exit ${failed})
|
||||
evaluate_retval
|
||||
|
||||
# Detect device
|
||||
while read -r dev mountpoint fs options; do
|
||||
mount | while read -r dev tmp1 mountpoint tmp2; do
|
||||
[ "${dev}" = "rootfs" ] && continue
|
||||
|
||||
if [ "${mountpoint}" = "/" ]; then
|
||||
@@ -57,7 +63,7 @@ case "${1}" in
|
||||
sleep 15
|
||||
reboot -f
|
||||
fi
|
||||
done < /proc/mounts
|
||||
done
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 2014-10-15 08:32:29.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/db88f6281-bp-setup.c 2014-11-05 22:07:58.828714499 +0100
|
||||
@@ -0,0 +1,108 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/db88f6281-bp-setup.c
|
||||
@@ -112,7 +112,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/db88f6281-bp-setup.c linux-3
|
||||
+MACHINE_END
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c 2014-10-15 08:32:29.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/dockstar-setup.c 2014-11-05 22:07:58.828714499 +0100
|
||||
@@ -0,0 +1,111 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/dockstar-setup.c
|
||||
@@ -227,7 +227,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dockstar-setup.c linux-3.14.
|
||||
+MACHINE_END
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c 2014-11-04 00:25:48.383688273 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/dreamplug-setup.c 2014-11-05 22:07:58.833714499 +0100
|
||||
@@ -0,0 +1,151 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/dreamplug-setup.c
|
||||
@@ -382,7 +382,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/dreamplug-setup.c linux-3.14
|
||||
+MACHINE_END
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c 2014-11-04 00:25:48.383688273 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/guruplug-setup.c 2014-11-05 22:07:58.838714499 +0100
|
||||
@@ -0,0 +1,135 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/guruplug-setup.c
|
||||
@@ -521,7 +521,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/guruplug-setup.c linux-3.14.
|
||||
+MACHINE_END
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c 2014-11-04 00:25:48.383688273 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/iconnect-setup.c 2014-11-05 22:07:58.843714499 +0100
|
||||
@@ -0,0 +1,214 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/iconnect-setup.c
|
||||
@@ -739,7 +739,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/iconnect-setup.c linux-3.14.
|
||||
+MACHINE_END
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig linux-3.14.22/arch/arm/mach-kirkwood/Kconfig
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig 2014-10-15 08:42:04.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/Kconfig 2014-11-04 01:10:52.950526196 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/Kconfig 2014-11-05 22:07:58.848714499 +0100
|
||||
@@ -1,3 +1,5 @@
|
||||
+
|
||||
+
|
||||
@@ -840,8 +840,8 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Kconfig linux-3.14.22/arch/a
|
||||
endif
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/arm/mach-kirkwood/Makefile
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile 2014-10-15 08:42:04.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/Makefile 2014-11-04 01:11:13.009019440 +0100
|
||||
@@ -2,6 +2,14 @@
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/Makefile 2014-11-05 22:09:01.758714529 +0100
|
||||
@@ -2,6 +2,15 @@
|
||||
obj-$(CONFIG_KIRKWOOD_LEGACY) += irq.o mpp.o
|
||||
obj-$(CONFIG_PM) += pm.o
|
||||
|
||||
@@ -849,6 +849,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/
|
||||
+obj-$(CONFIG_MACH_DOCKSTAR) += dockstar-setup.o
|
||||
+obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
|
||||
+obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
|
||||
+obj-$(CONFIG_MACH_DREAMPLUG) += dreamplug-setup.o
|
||||
+obj-$(CONFIG_MACH_INETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
|
||||
+obj-$(CONFIG_MACH_NETSPACE_MAX_V2) += netspace_v2-setup.o lacie_v2-common.o
|
||||
+obj-$(CONFIG_MACH_NETSPACE_V2) += netspace_v2-setup.o lacie_v2-common.o
|
||||
@@ -856,7 +857,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/
|
||||
obj-$(CONFIG_MACH_D2NET_V2) += d2net_v2-setup.o lacie_v2-common.o
|
||||
obj-$(CONFIG_MACH_NET2BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
|
||||
obj-$(CONFIG_MACH_NET5BIG_V2) += netxbig_v2-setup.o lacie_v2-common.o
|
||||
@@ -11,6 +19,8 @@
|
||||
@@ -11,6 +20,8 @@
|
||||
obj-$(CONFIG_MACH_T5325) += t5325-setup.o
|
||||
obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o
|
||||
obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o
|
||||
@@ -867,7 +868,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/Makefile linux-3.14.22/arch/
|
||||
obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT) += board-mv88f6281gtw_ge.o
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c 2014-11-04 00:25:48.393687522 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/nas6210-setup.c 2014-11-05 22:07:58.858714499 +0100
|
||||
@@ -0,0 +1,185 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/nas6210-setup.c
|
||||
@@ -1056,7 +1057,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/nas6210-setup.c linux-3.14.2
|
||||
+MACHINE_END
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c 2014-10-15 08:32:29.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/netspace_v2-setup.c 2014-11-05 22:07:58.858714499 +0100
|
||||
@@ -0,0 +1,293 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/netspace_v2-setup.c
|
||||
@@ -1353,7 +1354,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/netspace_v2-setup.c linux-3.
|
||||
+#endif
|
||||
diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
--- linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c 2014-10-15 08:32:29.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/mach-kirkwood/sheevaplug-setup.c 2014-11-05 22:07:58.868714499 +0100
|
||||
@@ -0,0 +1,161 @@
|
||||
+/*
|
||||
+ * arch/arm/mach-kirkwood/sheevaplug-setup.c
|
||||
@@ -1518,7 +1519,7 @@ diff -Naur linux-3.14.22.org/arch/arm/mach-kirkwood/sheevaplug-setup.c linux-3.1
|
||||
+#endif
|
||||
diff -Naur linux-3.14.22.org/arch/arm/tools/mach-types linux-3.14.22/arch/arm/tools/mach-types
|
||||
--- linux-3.14.22.org/arch/arm/tools/mach-types 2014-10-15 08:42:04.000000000 +0200
|
||||
+++ linux-3.14.22/arch/arm/tools/mach-types 2014-11-04 00:25:48.393687522 +0100
|
||||
+++ linux-3.14.22/arch/arm/tools/mach-types 2014-11-05 22:07:58.868714499 +0100
|
||||
@@ -447,6 +447,7 @@
|
||||
smartq5 MACH_SMARTQ5 SMARTQ5 2534
|
||||
davinci_dm6467tevm MACH_DAVINCI_DM6467TEVM DAVINCI_DM6467TEVM 2548
|
||||
|
||||
465
src/patches/linux-3.14.22-ledtrig_netdev.patch
Normal file
465
src/patches/linux-3.14.22-ledtrig_netdev.patch
Normal file
@@ -0,0 +1,465 @@
|
||||
diff -Naur linux-3.14.22.org/drivers/leds/trigger/Kconfig linux-3.14.22/drivers/leds/trigger/Kconfig
|
||||
--- linux-3.14.22.org/drivers/leds/trigger/Kconfig 2014-10-15 08:42:04.000000000 +0200
|
||||
+++ linux-3.14.22/drivers/leds/trigger/Kconfig 2014-11-06 17:52:02.303748375 +0100
|
||||
@@ -108,4 +108,11 @@
|
||||
This enables direct flash/torch on/off by the driver, kernel space.
|
||||
If unsure, say Y.
|
||||
|
||||
+config LEDS_TRIGGER_NETDEV
|
||||
+ tristate "LED Netdev Trigger"
|
||||
+ depends on NET && LEDS_TRIGGERS
|
||||
+ help
|
||||
+ This allows LEDs to be controlled by network device activity.
|
||||
+ If unsure, say Y.
|
||||
+
|
||||
endif # LEDS_TRIGGERS
|
||||
diff -Naur linux-3.14.22.org/drivers/leds/trigger/ledtrig-netdev.c linux-3.14.22/drivers/leds/trigger/ledtrig-netdev.c
|
||||
--- linux-3.14.22.org/drivers/leds/trigger/ledtrig-netdev.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.14.22/drivers/leds/trigger/ledtrig-netdev.c 2014-11-06 17:47:09.913748236 +0100
|
||||
@@ -0,0 +1,438 @@
|
||||
+/*
|
||||
+ * LED Kernel Netdev Trigger
|
||||
+ *
|
||||
+ * Toggles the LED to reflect the link and traffic state of a named net device
|
||||
+ *
|
||||
+ * Copyright 2007 Oliver Jowett <oliver@opencloud.com>
|
||||
+ *
|
||||
+ * Derived from ledtrig-timer.c which is:
|
||||
+ * Copyright 2005-2006 Openedhand Ltd.
|
||||
+ * Author: Richard Purdie <rpurdie@openedhand.com>
|
||||
+ *
|
||||
+ * This program is free software; you can redistribute it and/or modify
|
||||
+ * it under the terms of the GNU General Public License version 2 as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/jiffies.h>
|
||||
+#include <linux/kernel.h>
|
||||
+#include <linux/init.h>
|
||||
+#include <linux/list.h>
|
||||
+#include <linux/spinlock.h>
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/netdevice.h>
|
||||
+#include <linux/timer.h>
|
||||
+#include <linux/ctype.h>
|
||||
+#include <linux/leds.h>
|
||||
+
|
||||
+#include "../leds.h"
|
||||
+
|
||||
+/*
|
||||
+ * Configurable sysfs attributes:
|
||||
+ *
|
||||
+ * device_name - network device name to monitor
|
||||
+ *
|
||||
+ * interval - duration of LED blink, in milliseconds
|
||||
+ *
|
||||
+ * mode - either "none" (LED is off) or a space separated list of one or more of:
|
||||
+ * link: LED's normal state reflects whether the link is up (has carrier) or not
|
||||
+ * tx: LED blinks on transmitted data
|
||||
+ * rx: LED blinks on receive data
|
||||
+ *
|
||||
+ * Some suggestions:
|
||||
+ *
|
||||
+ * Simple link status LED:
|
||||
+ * $ echo netdev >someled/trigger
|
||||
+ * $ echo eth0 >someled/device_name
|
||||
+ * $ echo link >someled/mode
|
||||
+ *
|
||||
+ * Ethernet-style link/activity LED:
|
||||
+ * $ echo netdev >someled/trigger
|
||||
+ * $ echo eth0 >someled/device_name
|
||||
+ * $ echo "link tx rx" >someled/mode
|
||||
+ *
|
||||
+ * Modem-style tx/rx LEDs:
|
||||
+ * $ echo netdev >led1/trigger
|
||||
+ * $ echo ppp0 >led1/device_name
|
||||
+ * $ echo tx >led1/mode
|
||||
+ * $ echo netdev >led2/trigger
|
||||
+ * $ echo ppp0 >led2/device_name
|
||||
+ * $ echo rx >led2/mode
|
||||
+ *
|
||||
+ */
|
||||
+
|
||||
+#define MODE_LINK 1
|
||||
+#define MODE_TX 2
|
||||
+#define MODE_RX 4
|
||||
+
|
||||
+struct led_netdev_data {
|
||||
+ rwlock_t lock;
|
||||
+
|
||||
+ struct timer_list timer;
|
||||
+ struct notifier_block notifier;
|
||||
+
|
||||
+ struct led_classdev *led_cdev;
|
||||
+ struct net_device *net_dev;
|
||||
+
|
||||
+ char device_name[IFNAMSIZ];
|
||||
+ unsigned interval;
|
||||
+ unsigned mode;
|
||||
+ unsigned link_up;
|
||||
+ unsigned last_activity;
|
||||
+};
|
||||
+
|
||||
+static void set_baseline_state(struct led_netdev_data *trigger_data)
|
||||
+{
|
||||
+ if ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up)
|
||||
+ led_set_brightness(trigger_data->led_cdev, LED_FULL);
|
||||
+ else
|
||||
+ led_set_brightness(trigger_data->led_cdev, LED_OFF);
|
||||
+
|
||||
+ if ((trigger_data->mode & (MODE_TX | MODE_RX)) != 0 && trigger_data->link_up)
|
||||
+ mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
|
||||
+ else
|
||||
+ del_timer(&trigger_data->timer);
|
||||
+}
|
||||
+
|
||||
+static ssize_t led_device_name_show(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+
|
||||
+ read_lock(&trigger_data->lock);
|
||||
+ sprintf(buf, "%s\n", trigger_data->device_name);
|
||||
+ read_unlock(&trigger_data->lock);
|
||||
+
|
||||
+ return strlen(buf) + 1;
|
||||
+}
|
||||
+
|
||||
+static ssize_t led_device_name_store(struct device *dev,
|
||||
+ struct device_attribute *attr, const char *buf, size_t size)
|
||||
+{
|
||||
+ struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+
|
||||
+ if (size < 0 || size >= IFNAMSIZ)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ write_lock(&trigger_data->lock);
|
||||
+
|
||||
+ strcpy(trigger_data->device_name, buf);
|
||||
+ if (size > 0 && trigger_data->device_name[size-1] == '\n')
|
||||
+ trigger_data->device_name[size-1] = 0;
|
||||
+
|
||||
+ if (trigger_data->device_name[0] != 0) {
|
||||
+ /* check for existing device to update from */
|
||||
+ trigger_data->net_dev = dev_get_by_name(&init_net, trigger_data->device_name);
|
||||
+ if (trigger_data->net_dev != NULL)
|
||||
+ trigger_data->link_up = (dev_get_flags(trigger_data->net_dev) & IFF_LOWER_UP) != 0;
|
||||
+ set_baseline_state(trigger_data); /* updates LEDs, may start timers */
|
||||
+ }
|
||||
+
|
||||
+ write_unlock(&trigger_data->lock);
|
||||
+ return size;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR(device_name, 0644, led_device_name_show, led_device_name_store);
|
||||
+
|
||||
+static ssize_t led_mode_show(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+
|
||||
+ read_lock(&trigger_data->lock);
|
||||
+
|
||||
+ if (trigger_data->mode == 0) {
|
||||
+ strcpy(buf, "none\n");
|
||||
+ } else {
|
||||
+ if (trigger_data->mode & MODE_LINK)
|
||||
+ strcat(buf, "link ");
|
||||
+ if (trigger_data->mode & MODE_TX)
|
||||
+ strcat(buf, "tx ");
|
||||
+ if (trigger_data->mode & MODE_RX)
|
||||
+ strcat(buf, "rx ");
|
||||
+ strcat(buf, "\n");
|
||||
+ }
|
||||
+
|
||||
+ read_unlock(&trigger_data->lock);
|
||||
+
|
||||
+ return strlen(buf)+1;
|
||||
+}
|
||||
+
|
||||
+static ssize_t led_mode_store(struct device *dev,
|
||||
+ struct device_attribute *attr, const char *buf, size_t size)
|
||||
+{
|
||||
+ struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+ char copybuf[128];
|
||||
+ int new_mode = -1;
|
||||
+ char *p, *token;
|
||||
+
|
||||
+ /* take a copy since we don't want to trash the inbound buffer when using strsep */
|
||||
+ strncpy(copybuf, buf, sizeof(copybuf));
|
||||
+ copybuf[sizeof(copybuf) - 1] = 0;
|
||||
+ p = copybuf;
|
||||
+
|
||||
+ while ((token = strsep(&p, " \t\n")) != NULL) {
|
||||
+ if (!*token)
|
||||
+ continue;
|
||||
+
|
||||
+ if (new_mode == -1)
|
||||
+ new_mode = 0;
|
||||
+
|
||||
+ if (!strcmp(token, "none"))
|
||||
+ new_mode = 0;
|
||||
+ else if (!strcmp(token, "tx"))
|
||||
+ new_mode |= MODE_TX;
|
||||
+ else if (!strcmp(token, "rx"))
|
||||
+ new_mode |= MODE_RX;
|
||||
+ else if (!strcmp(token, "link"))
|
||||
+ new_mode |= MODE_LINK;
|
||||
+ else
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ if (new_mode == -1)
|
||||
+ return -EINVAL;
|
||||
+
|
||||
+ write_lock(&trigger_data->lock);
|
||||
+ trigger_data->mode = new_mode;
|
||||
+ set_baseline_state(trigger_data);
|
||||
+ write_unlock(&trigger_data->lock);
|
||||
+
|
||||
+ return size;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR(mode, 0644, led_mode_show, led_mode_store);
|
||||
+
|
||||
+static ssize_t led_interval_show(struct device *dev,
|
||||
+ struct device_attribute *attr, char *buf)
|
||||
+{
|
||||
+ struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+
|
||||
+ read_lock(&trigger_data->lock);
|
||||
+ sprintf(buf, "%u\n", jiffies_to_msecs(trigger_data->interval));
|
||||
+ read_unlock(&trigger_data->lock);
|
||||
+
|
||||
+ return strlen(buf) + 1;
|
||||
+}
|
||||
+
|
||||
+static ssize_t led_interval_store(struct device *dev,
|
||||
+ struct device_attribute *attr, const char *buf, size_t size)
|
||||
+{
|
||||
+ struct led_classdev *led_cdev = dev_get_drvdata(dev);
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+ int ret = -EINVAL;
|
||||
+ char *after;
|
||||
+ unsigned long value = simple_strtoul(buf, &after, 10);
|
||||
+ size_t count = after - buf;
|
||||
+
|
||||
+ if (isspace(*after))
|
||||
+ count++;
|
||||
+
|
||||
+ /* impose some basic bounds on the timer interval */
|
||||
+ if (count == size && value >= 5 && value <= 10000) {
|
||||
+ write_lock(&trigger_data->lock);
|
||||
+ trigger_data->interval = msecs_to_jiffies(value);
|
||||
+ set_baseline_state(trigger_data); /* resets timer */
|
||||
+ write_unlock(&trigger_data->lock);
|
||||
+ ret = count;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static DEVICE_ATTR(interval, 0644, led_interval_show, led_interval_store);
|
||||
+
|
||||
+static int netdev_trig_notify(struct notifier_block *nb,
|
||||
+ unsigned long evt,
|
||||
+ void *dv)
|
||||
+{
|
||||
+ struct net_device *dev = netdev_notifier_info_to_dev((struct netdev_notifier_info *) dv);
|
||||
+ struct led_netdev_data *trigger_data = container_of(nb, struct led_netdev_data, notifier);
|
||||
+
|
||||
+ if (evt != NETDEV_UP && evt != NETDEV_DOWN && evt != NETDEV_CHANGE && evt != NETDEV_REGISTER && evt != NETDEV_UNREGISTER)
|
||||
+ return NOTIFY_DONE;
|
||||
+
|
||||
+ write_lock(&trigger_data->lock);
|
||||
+
|
||||
+ if (strcmp(dev->name, trigger_data->device_name))
|
||||
+ goto done;
|
||||
+
|
||||
+ if (evt == NETDEV_REGISTER) {
|
||||
+ if (trigger_data->net_dev != NULL)
|
||||
+ dev_put(trigger_data->net_dev);
|
||||
+ dev_hold(dev);
|
||||
+ trigger_data->net_dev = dev;
|
||||
+ trigger_data->link_up = 0;
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ if (evt == NETDEV_UNREGISTER && trigger_data->net_dev != NULL) {
|
||||
+ dev_put(trigger_data->net_dev);
|
||||
+ trigger_data->net_dev = NULL;
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ /* UP / DOWN / CHANGE */
|
||||
+
|
||||
+ trigger_data->link_up = (evt != NETDEV_DOWN && netif_carrier_ok(dev));
|
||||
+ set_baseline_state(trigger_data);
|
||||
+
|
||||
+done:
|
||||
+ write_unlock(&trigger_data->lock);
|
||||
+ return NOTIFY_DONE;
|
||||
+}
|
||||
+
|
||||
+/* here's the real work! */
|
||||
+static void netdev_trig_timer(unsigned long arg)
|
||||
+{
|
||||
+ struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
|
||||
+ struct rtnl_link_stats64 *dev_stats;
|
||||
+ unsigned new_activity;
|
||||
+ struct rtnl_link_stats64 temp;
|
||||
+
|
||||
+ write_lock(&trigger_data->lock);
|
||||
+
|
||||
+ if (!trigger_data->link_up || !trigger_data->net_dev || (trigger_data->mode & (MODE_TX | MODE_RX)) == 0) {
|
||||
+ /* we don't need to do timer work, just reflect link state. */
|
||||
+ led_set_brightness(trigger_data->led_cdev, ((trigger_data->mode & MODE_LINK) != 0 && trigger_data->link_up) ? LED_FULL : LED_OFF);
|
||||
+ goto no_restart;
|
||||
+ }
|
||||
+
|
||||
+ dev_stats = dev_get_stats(trigger_data->net_dev, &temp);
|
||||
+ new_activity =
|
||||
+ ((trigger_data->mode & MODE_TX) ? dev_stats->tx_packets : 0) +
|
||||
+ ((trigger_data->mode & MODE_RX) ? dev_stats->rx_packets : 0);
|
||||
+
|
||||
+ if (trigger_data->mode & MODE_LINK) {
|
||||
+ /* base state is ON (link present) */
|
||||
+ /* if there's no link, we don't get this far and the LED is off */
|
||||
+
|
||||
+ /* OFF -> ON always */
|
||||
+ /* ON -> OFF on activity */
|
||||
+ if (trigger_data->led_cdev->brightness == LED_OFF) {
|
||||
+ led_set_brightness(trigger_data->led_cdev, LED_FULL);
|
||||
+ } else if (trigger_data->last_activity != new_activity) {
|
||||
+ led_set_brightness(trigger_data->led_cdev, LED_OFF);
|
||||
+ }
|
||||
+ } else {
|
||||
+ /* base state is OFF */
|
||||
+ /* ON -> OFF always */
|
||||
+ /* OFF -> ON on activity */
|
||||
+ if (trigger_data->led_cdev->brightness == LED_FULL) {
|
||||
+ led_set_brightness(trigger_data->led_cdev, LED_OFF);
|
||||
+ } else if (trigger_data->last_activity != new_activity) {
|
||||
+ led_set_brightness(trigger_data->led_cdev, LED_FULL);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ trigger_data->last_activity = new_activity;
|
||||
+ mod_timer(&trigger_data->timer, jiffies + trigger_data->interval);
|
||||
+
|
||||
+no_restart:
|
||||
+ write_unlock(&trigger_data->lock);
|
||||
+}
|
||||
+
|
||||
+static void netdev_trig_activate(struct led_classdev *led_cdev)
|
||||
+{
|
||||
+ struct led_netdev_data *trigger_data;
|
||||
+ int rc;
|
||||
+
|
||||
+ trigger_data = kzalloc(sizeof(struct led_netdev_data), GFP_KERNEL);
|
||||
+ if (!trigger_data)
|
||||
+ return;
|
||||
+
|
||||
+ rwlock_init(&trigger_data->lock);
|
||||
+
|
||||
+ trigger_data->notifier.notifier_call = netdev_trig_notify;
|
||||
+ trigger_data->notifier.priority = 10;
|
||||
+
|
||||
+ setup_timer(&trigger_data->timer, netdev_trig_timer, (unsigned long) trigger_data);
|
||||
+
|
||||
+ trigger_data->led_cdev = led_cdev;
|
||||
+ trigger_data->net_dev = NULL;
|
||||
+ trigger_data->device_name[0] = 0;
|
||||
+
|
||||
+ trigger_data->mode = 0;
|
||||
+ trigger_data->interval = msecs_to_jiffies(50);
|
||||
+ trigger_data->link_up = 0;
|
||||
+ trigger_data->last_activity = 0;
|
||||
+
|
||||
+ led_cdev->trigger_data = trigger_data;
|
||||
+
|
||||
+ rc = device_create_file(led_cdev->dev, &dev_attr_device_name);
|
||||
+ if (rc)
|
||||
+ goto err_out;
|
||||
+ rc = device_create_file(led_cdev->dev, &dev_attr_mode);
|
||||
+ if (rc)
|
||||
+ goto err_out_device_name;
|
||||
+ rc = device_create_file(led_cdev->dev, &dev_attr_interval);
|
||||
+ if (rc)
|
||||
+ goto err_out_mode;
|
||||
+
|
||||
+ register_netdevice_notifier(&trigger_data->notifier);
|
||||
+ return;
|
||||
+
|
||||
+err_out_mode:
|
||||
+ device_remove_file(led_cdev->dev, &dev_attr_mode);
|
||||
+err_out_device_name:
|
||||
+ device_remove_file(led_cdev->dev, &dev_attr_device_name);
|
||||
+err_out:
|
||||
+ led_cdev->trigger_data = NULL;
|
||||
+ kfree(trigger_data);
|
||||
+}
|
||||
+
|
||||
+static void netdev_trig_deactivate(struct led_classdev *led_cdev)
|
||||
+{
|
||||
+ struct led_netdev_data *trigger_data = led_cdev->trigger_data;
|
||||
+
|
||||
+ if (trigger_data) {
|
||||
+ unregister_netdevice_notifier(&trigger_data->notifier);
|
||||
+
|
||||
+ device_remove_file(led_cdev->dev, &dev_attr_device_name);
|
||||
+ device_remove_file(led_cdev->dev, &dev_attr_mode);
|
||||
+ device_remove_file(led_cdev->dev, &dev_attr_interval);
|
||||
+
|
||||
+ write_lock(&trigger_data->lock);
|
||||
+
|
||||
+ if (trigger_data->net_dev) {
|
||||
+ dev_put(trigger_data->net_dev);
|
||||
+ trigger_data->net_dev = NULL;
|
||||
+ }
|
||||
+
|
||||
+ write_unlock(&trigger_data->lock);
|
||||
+
|
||||
+ del_timer_sync(&trigger_data->timer);
|
||||
+
|
||||
+ kfree(trigger_data);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static struct led_trigger netdev_led_trigger = {
|
||||
+ .name = "netdev",
|
||||
+ .activate = netdev_trig_activate,
|
||||
+ .deactivate = netdev_trig_deactivate,
|
||||
+};
|
||||
+
|
||||
+static int __init netdev_trig_init(void)
|
||||
+{
|
||||
+ return led_trigger_register(&netdev_led_trigger);
|
||||
+}
|
||||
+
|
||||
+static void __exit netdev_trig_exit(void)
|
||||
+{
|
||||
+ led_trigger_unregister(&netdev_led_trigger);
|
||||
+}
|
||||
+
|
||||
+module_init(netdev_trig_init);
|
||||
+module_exit(netdev_trig_exit);
|
||||
+
|
||||
+MODULE_AUTHOR("Oliver Jowett <oliver@opencloud.com>");
|
||||
+MODULE_DESCRIPTION("Netdev LED trigger");
|
||||
+MODULE_LICENSE("GPL");
|
||||
diff -Naur linux-3.14.22.org/drivers/leds/trigger/Makefile linux-3.14.22/drivers/leds/trigger/Makefile
|
||||
--- linux-3.14.22.org/drivers/leds/trigger/Makefile 2014-10-15 08:42:04.000000000 +0200
|
||||
+++ linux-3.14.22/drivers/leds/trigger/Makefile 2014-11-06 17:51:29.818748360 +0100
|
||||
@@ -8,3 +8,4 @@
|
||||
obj-$(CONFIG_LEDS_TRIGGER_DEFAULT_ON) += ledtrig-default-on.o
|
||||
obj-$(CONFIG_LEDS_TRIGGER_TRANSIENT) += ledtrig-transient.o
|
||||
obj-$(CONFIG_LEDS_TRIGGER_CAMERA) += ledtrig-camera.o
|
||||
+obj-$(CONFIG_LEDS_TRIGGER_NETDEV) += ledtrig-netdev.o
|
||||
Reference in New Issue
Block a user