mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
9261e7447e
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>
61 lines
1.7 KiB
Diff
61 lines
1.7 KiB
Diff
From: Felix Fietkau <nbd@nbd.name>
|
|
Date: Thu, 15 Mar 2018 20:49:58 +0100
|
|
Subject: [PATCH] net: 8021q: support hardware flow table offload
|
|
|
|
Add the VLAN ID and protocol information
|
|
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|
---
|
|
|
|
--- a/net/8021q/vlan_dev.c
|
|
+++ b/net/8021q/vlan_dev.c
|
|
@@ -32,6 +32,10 @@
|
|
#include <linux/phy.h>
|
|
#include <net/arp.h>
|
|
#include <net/switchdev.h>
|
|
+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
|
|
+#include <linux/netfilter.h>
|
|
+#include <net/netfilter/nf_flow_table.h>
|
|
+#endif
|
|
|
|
#include "vlan.h"
|
|
#include "vlanproc.h"
|
|
@@ -768,6 +772,27 @@ static int vlan_dev_get_iflink(const str
|
|
return real_dev->ifindex;
|
|
}
|
|
|
|
+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
|
|
+static int vlan_dev_flow_offload_check(struct flow_offload_hw_path *path)
|
|
+{
|
|
+ struct net_device *dev = path->dev;
|
|
+ struct vlan_dev_priv *vlan = vlan_dev_priv(dev);
|
|
+
|
|
+ if (path->flags & FLOW_OFFLOAD_PATH_VLAN)
|
|
+ return -EEXIST;
|
|
+
|
|
+ path->flags |= FLOW_OFFLOAD_PATH_VLAN;
|
|
+ path->vlan_proto = vlan->vlan_proto;
|
|
+ path->vlan_id = vlan->vlan_id;
|
|
+ path->dev = vlan->real_dev;
|
|
+
|
|
+ if (vlan->real_dev->netdev_ops->ndo_flow_offload_check)
|
|
+ return vlan->real_dev->netdev_ops->ndo_flow_offload_check(path);
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+#endif /* CONFIG_NF_FLOW_TABLE */
|
|
+
|
|
static const struct ethtool_ops vlan_ethtool_ops = {
|
|
.get_link_ksettings = vlan_ethtool_get_link_ksettings,
|
|
.get_drvinfo = vlan_ethtool_get_drvinfo,
|
|
@@ -805,6 +830,9 @@ static const struct net_device_ops vlan_
|
|
.ndo_fix_features = vlan_dev_fix_features,
|
|
.ndo_get_lock_subclass = vlan_dev_get_lock_subclass,
|
|
.ndo_get_iflink = vlan_dev_get_iflink,
|
|
+#if IS_ENABLED(CONFIG_NF_FLOW_TABLE)
|
|
+ .ndo_flow_offload_check = vlan_dev_flow_offload_check,
|
|
+#endif
|
|
};
|
|
|
|
static void vlan_dev_free(struct net_device *dev)
|