projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.14 to 4.14.160
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
hack-4.14
/
721-phy_packets.patch
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 62d0295173b4f601cc072340481c72d1cf54bd18..2c59e837afd9cfeda6ffe09b87749e009af82dd8 100644
(file)
--- a/
target/linux/generic/hack-4.14/721-phy_packets.patch
+++ b/
target/linux/generic/hack-4.14/721-phy_packets.patch
@@
-15,23
+15,23
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1386,6 +1386,7 @@ enum netdev_priv_flags {
- IFF_RXFH_CONFIGURED = 1<<25,
+@@ -1412,6 +1412,7 @@ enum netdev_priv_flags {
IFF_PHONY_HEADROOM = 1<<26,
IFF_MACSEC = 1<<27,
IFF_PHONY_HEADROOM = 1<<26,
IFF_MACSEC = 1<<27,
-+ IFF_NO_IP_ALIGN = 1<<28,
+ IFF_L3MDEV_RX_HANDLER = 1<<28,
++ IFF_NO_IP_ALIGN = 1<<29,
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -1415,6 +1416,7 @@ enum netdev_priv_flags {
- #define IFF_TEAM IFF_TEAM
+@@ -1442,6 +1443,7 @@ enum netdev_priv_flags {
#define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED
#define IFF_MACSEC IFF_MACSEC
#define IFF_RXFH_CONFIGURED IFF_RXFH_CONFIGURED
#define IFF_MACSEC IFF_MACSEC
+ #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER
+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN
/**
* struct net_device - The DEVICE structure.
+#define IFF_NO_IP_ALIGN IFF_NO_IP_ALIGN
/**
* struct net_device - The DEVICE structure.
-@@ -17
01,6 +1703
,11 @@ struct net_device {
+@@ -17
28,6 +1730
,11 @@ struct net_device {
const struct xfrmdev_ops *xfrmdev_ops;
#endif
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;
const struct header_ops *header_ops;
unsigned int flags;
-@@ -1
770,6 +1777
,10 @@ struct net_device {
+@@ -1
802,6 +1809
,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
struct mpls_dev __rcu *mpls_ptr;
#endif
@@
-56,7
+56,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -2
491,6 +2491
,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -2
530,6 +2530
,10 @@ static inline int pskb_trim(struct sk_bu
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
}
@@
-67,7
+67,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
/**
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
* @skb: buffer to alter
-@@ -26
21,16 +262
5,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -26
61,16 +266
5,6 @@ static inline struct sk_buff *dev_alloc_
}
}
@@
-101,7
+101,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -
2982,10 +2982
,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -
3004,10 +3004
,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
dev_queue_xmit_nit(skb, dev);
if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all))
dev_queue_xmit_nit(skb, dev);
@@
-136,7
+136,7
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include <net/protocol.h>
#include <net/dst.h>
#include <net/protocol.h>
#include <net/dst.h>
-@@ -
499,6 +500
,22 @@ skb_fail:
+@@ -
503,6 +504
,22 @@ skb_fail:
}
EXPORT_SYMBOL(__napi_alloc_skb);
}
EXPORT_SYMBOL(__napi_alloc_skb);