aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-4.14/721-phy_packets.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-02-22 12:21:05 +0100
committerFelix Fietkau <nbd@nbd.name>2018-02-22 12:46:25 +0100
commitaad1f11efe1c0f761d3454ac371fd98e65284b35 (patch)
tree96b046b404941f541c6ca5b86d94f25c0b66441b /target/linux/generic/hack-4.14/721-phy_packets.patch
parent14a01311f5b834cda6962e866e855d27325d232b (diff)
downloadupstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.tar.gz
upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.tar.bz2
upstream-aad1f11efe1c0f761d3454ac371fd98e65284b35.zip
kernel: refresh patches
Some fuzz was introduced due to the netfilter-offload series Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/hack-4.14/721-phy_packets.patch')
-rw-r--r--target/linux/generic/hack-4.14/721-phy_packets.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/hack-4.14/721-phy_packets.patch b/target/linux/generic/hack-4.14/721-phy_packets.patch
index 07e6e9da6d..5334b23e81 100644
--- a/target/linux/generic/hack-4.14/721-phy_packets.patch
+++ b/target/linux/generic/hack-4.14/721-phy_packets.patch
@@ -15,7 +15,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1386,6 +1386,7 @@ enum netdev_priv_flags {
+@@ -1399,6 +1399,7 @@ enum netdev_priv_flags {
IFF_RXFH_CONFIGURED = 1<<25,
IFF_PHONY_HEADROOM = 1<<26,
IFF_MACSEC = 1<<27,
@@ -23,7 +23,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1415,6 +1416,7 @@ enum netdev_priv_flags {
+@@ -1428,6 +1429,7 @@ enum netdev_priv_flags {
#define IFF_TEAM IFF_TEAM
#define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED
#define IFF_MACSEC IFF_MACSEC
@@ -31,7 +31,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* struct net_device - The DEVICE structure.
-@@ -1701,6 +1703,11 @@ struct net_device {
+@@ -1714,6 +1716,11 @@ struct net_device {
const struct xfrmdev_ops *xfrmdev_ops;
#endif
@@ -43,7 +43,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
const struct header_ops *header_ops;
unsigned int flags;
-@@ -1770,6 +1777,10 @@ struct net_device {
+@@ -1783,6 +1790,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif