SW/openwrt
2
0
Fork 0
forked from Ivasoft/openwrt
Code Pull Requests Activity

kernel: Make the patches apply on top of 4.19

Browse Source 
This makes the patches which were just copied in the previous commit
apply on top of kernel 4.19.

The patches in the backports-4.19 folder were checked if they are really
in kernel 4.19 based on the title and only removed if they were found in
the upstream kernel.

The following additional patches form the pending folder went into
upstream Linux 4.19:
pending-4.19/171-usb-dwc2-Fix-inefficient-copy-of-unaligned-buffers.patch
pending-4.19/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch
pending-4.19/478-mtd-spi-nor-Add-support-for-XM25QH64A-and-XM25QH128A.patch
pending-4.19/479-mtd-spi-nor-add-eon-en25qh32.patch
pending-4.19/950-tty-serial-exar-generalize-rs485-setup.patch
pending-4.19/340-MIPS-mm-remove-mips_dma_mapping_error.patch

Bigger changes were introduced to the m25p80 spi nor driver, as far as I
saw it in the new code, it now has the functionality provided in this
patch:
pending-4.19/450-mtd-m25p80-allow-fallback-from-spi_flash_read-to-reg.patch

Part of this patch went upstream independent of OpenWrt:
hack-4.19/220-gc_sections.patch
This patch was reworked to match the changes done upstream.

The MIPS DMA API changed a lot, this patch was rewritten to match the
new DMA handling:
pending-4.19/341-MIPS-mm-remove-no-op-dma_map_ops-where-possible.patch

I did bigger manual changes to the following patches and I am not 100% sure if they are all correct:
pending-4.19/0931-w1-gpio-fix-problem-with-platfom-data-in-w1-gpio.patch
pending-4.19/411-mtd-partial_eraseblock_write.patch
pending-4.19/600-netfilter_conntrack_flush.patch
pending-4.19/611-netfilter_match_bypass_default_table.patch
pending-4.19/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch
hack-4.19/211-host_tools_portability.patch
hack-4.19/221-module_exports.patch
hack-4.19/321-powerpc_crtsavres_prereq.patch
hack-4.19/902-debloat_proc.patch

This is based on patchset from Marko Ratkaj <marko.ratkaj@sartura.hr>

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Hauke Mehrtens
2018-11-01 18:01:44 +01:00
parent 52a82ce3dd
commit 9261e7447e
225 changed files with 1182 additions and 19292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
target/linux/generic/files/drivers/net/phy/swconfig_leds.c
View File

@@ -274,19 +274,16 @@ static ssize_t swconfig_trig_mode_store(struct device *dev,
static DEVICE_ATTR(mode, 0644, swconfig_trig_mode_show,
swconfig_trig_mode_store);
static void
static int
swconfig_trig_activate(struct led_classdev *led_cdev)
{
struct switch_led_trigger *sw_trig;
struct swconfig_trig_data *trig_data;
int err;
if (led_cdev->trigger->activate != swconfig_trig_activate)
return;
trig_data = kzalloc(sizeof(struct swconfig_trig_data), GFP_KERNEL);
if (!trig_data)
return;
return -ENOMEM;
sw_trig = (void *) led_cdev->trigger;
@@ -309,7 +306,7 @@ swconfig_trig_activate(struct led_classdev *led_cdev)
if (err)
goto err_mode_free;
return;
return 0;
err_mode_free:
device_remove_file(led_cdev->dev, &dev_attr_speed_mask);
@@ -320,8 +317,18 @@ err_dev_free:
err_free:
led_cdev->trigger_data = NULL;
kfree(trig_data);
return err;
}
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)
static void
swconfig_trig_activate_void(struct led_classdev *led_cdev)
{
swconfig_trig_activate(led_cdev);
}
#endif
static void
swconfig_trig_deactivate(struct led_classdev *led_cdev)
{
@@ -516,7 +523,11 @@ swconfig_create_led_trigger(struct switch_dev *swdev)
sw_trig->swdev = swdev;
sw_trig->trig.name = swdev->devname;
#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0)
sw_trig->trig.activate = swconfig_trig_activate_void;
#else
sw_trig->trig.activate = swconfig_trig_activate;
#endif
sw_trig->trig.deactivate = swconfig_trig_deactivate;
INIT_DELAYED_WORK(&sw_trig->sw_led_work, swconfig_led_work_func);