mirror of
https://github.com/Telecominfraproject/OpenNetworkLinux.git
synced 2025-12-25 17:27:01 +00:00
Latest import from opennetworklinux/linux
This commit is contained in:
@@ -1048,7 +1048,10 @@ CONFIG_EEPROM_AT25=y
|
||||
# CONFIG_EEPROM_LEGACY is not set
|
||||
# CONFIG_EEPROM_MAX6875 is not set
|
||||
CONFIG_EEPROM_ACCTON_AS5712_54x_SFP=y
|
||||
CONFIG_EEPROM_ACCTON_AS5812_54x_SFP=y
|
||||
CONFIG_EEPROM_ACCTON_AS5812_54t_SFP=y
|
||||
CONFIG_EEPROM_ACCTON_AS6712_32x_SFP=y
|
||||
CONFIG_EEPROM_ACCTON_AS6812_32x_SFP=y
|
||||
CONFIG_EEPROM_ACCTON_AS7512_32x_SFP=y
|
||||
CONFIG_EEPROM_ACCTON_AS7712_32x_SFP=y
|
||||
CONFIG_EEPROM_93CX6=y
|
||||
@@ -1401,8 +1404,13 @@ CONFIG_ENC28J60_WRITEVERIFY=y
|
||||
# CONFIG_NET_PACKET_ENGINE is not set
|
||||
# CONFIG_NET_VENDOR_QLOGIC is not set
|
||||
CONFIG_NET_VENDOR_REALTEK=y
|
||||
# CONFIG_8139CP is not set
|
||||
CONFIG_ATP=y
|
||||
CONFIG_8139CP=y
|
||||
# CONFIG_8139TOO is not set
|
||||
# CONFIG_8139TOO_PIO is not set
|
||||
CONFIG_8139TOO_TUNE_TWISTER=y
|
||||
CONFIG_8139TOO_8129=y
|
||||
# CONFIG_8139_OLD_RX_RESET is not set
|
||||
CONFIG_R8169=y
|
||||
# CONFIG_NET_VENDOR_RDC is not set
|
||||
# CONFIG_NET_VENDOR_SEEQ is not set
|
||||
@@ -1609,7 +1617,9 @@ CONFIG_I2C_MUX=y
|
||||
# Multiplexer I2C Chip support
|
||||
#
|
||||
CONFIG_I2C_MUX_ACCTON_AS5712_54x_CPLD=y
|
||||
CONFIG_I2C_MUX_ACCTON_AS5812_54x_CPLD=y
|
||||
CONFIG_I2C_MUX_ACCTON_AS6712_32x_CPLD=y
|
||||
CONFIG_I2C_MUX_ACCTON_AS6812_32x_CPLD=y
|
||||
CONFIG_I2C_MUX_GPIO=y
|
||||
CONFIG_I2C_MUX_PCA9541=y
|
||||
CONFIG_I2C_MUX_PCA954x=y
|
||||
@@ -1903,8 +1913,14 @@ CONFIG_SENSORS_W83781D=y
|
||||
CONFIG_SENSORS_CPR_4011_4MXX=y
|
||||
CONFIG_SENSORS_ACCTON_AS5712_54x_FAN=y
|
||||
CONFIG_SENSORS_ACCTON_AS5712_54x_PSU=y
|
||||
CONFIG_SENSORS_ACCTON_AS5812_54x_FAN=y
|
||||
CONFIG_SENSORS_ACCTON_AS5812_54x_PSU=y
|
||||
CONFIG_SENSORS_ACCTON_AS5812_54t_FAN=y
|
||||
CONFIG_SENSORS_ACCTON_AS5812_54t_PSU=y
|
||||
CONFIG_SENSORS_ACCTON_AS6712_32x_FAN=y
|
||||
CONFIG_SENSORS_ACCTON_AS6712_32x_PSU=y
|
||||
CONFIG_SENSORS_ACCTON_AS6812_32x_FAN=y
|
||||
CONFIG_SENSORS_ACCTON_AS6812_32x_PSU=y
|
||||
CONFIG_SENSORS_ACCTON_I2C_CPLD=y
|
||||
CONFIG_SENSORS_ACCTON_AS7512_32x_FAN=y
|
||||
CONFIG_SENSORS_ACCTON_AS7512_32x_PSU=y
|
||||
@@ -2231,7 +2247,10 @@ CONFIG_LEDS_CLASS=y
|
||||
# LED drivers
|
||||
#
|
||||
CONFIG_LEDS_ACCTON_AS5712_54x=y
|
||||
CONFIG_LEDS_ACCTON_AS5812_54x=y
|
||||
CONFIG_LEDS_ACCTON_AS5812_54t=y
|
||||
CONFIG_LEDS_ACCTON_AS6712_32x=y
|
||||
CONFIG_LEDS_ACCTON_AS6812_32x=y
|
||||
CONFIG_LEDS_ACCTON_AS7512_32x=y
|
||||
CONFIG_LEDS_ACCTON_AS7712_32x=y
|
||||
# CONFIG_LEDS_LM3530 is not set
|
||||
|
||||
@@ -4,19 +4,21 @@ diff --git a/drivers/net/tun.c b/drivers/net/tun.c
|
||||
index adc6269..078c36c 100644
|
||||
--- a/drivers/net/tun.c
|
||||
+++ b/drivers/net/tun.c
|
||||
@@ -350,6 +350,8 @@ static void tun_net_uninit(struct net_device *dev)
|
||||
@@ -350,6 +350,9 @@ static void tun_net_uninit(struct net_device *dev)
|
||||
struct tun_struct *tun = netdev_priv(dev);
|
||||
struct tun_file *tfile = tun->tfile;
|
||||
|
||||
+ void port_uninit_ethtool_stats(struct net_device *dev);
|
||||
+ port_uninit_ethtool_stats(dev);
|
||||
+
|
||||
/* Inform the methods they need to stop using the dev.
|
||||
*/
|
||||
if (tfile) {
|
||||
@@ -473,6 +475,8 @@ static u32 tun_net_fix_features(struct net_device *dev, u32 features)
|
||||
@@ -473,6 +476,9 @@ static u32 tun_net_fix_features(struct net_device *dev, u32 features)
|
||||
{
|
||||
struct tun_struct *tun = netdev_priv(dev);
|
||||
|
||||
+ void port_init_ethtool_stats(struct net_device *dev);
|
||||
+ port_init_ethtool_stats(dev);
|
||||
+
|
||||
return (features & tun->set_features) | (features & ~TUN_USER_FEATURES);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -753,9 +753,9 @@ index 0000000..ef9fadf
|
||||
+ model_name_len = 13;
|
||||
+ }
|
||||
+ else { /* 0x50 & 0x53 */
|
||||
+ /* ym2651 AC power */
|
||||
+ command = 0x20;
|
||||
+ model_name_len = 8;
|
||||
+ /* um400d01x DC power */
|
||||
+ command = 0x50;
|
||||
+ model_name_len = 13;
|
||||
+ }
|
||||
+
|
||||
+ status = as6712_32x_psu_read_block(client,command,data->model_name,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -241,3 +241,6 @@ overlayfs_notify.patch
|
||||
platform-accton-as7512_32x-device-drivers.patch
|
||||
driver-pca954x-i2c-mux-deselect-on-exit-config-option.patch
|
||||
platform-accton-as7712_32x-device-drivers.patch
|
||||
platform-accton-as5812_54x-device-drivers.patch
|
||||
platform-accton-as6812_32x-device-drivers.patch
|
||||
platform-accton-as5812_54t-device-drivers.patch
|
||||
|
||||
Reference in New Issue
Block a user