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.9 to 4.9.160
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
hack-4.9
/
721-phy_packets.patch
diff --git
a/target/linux/generic/hack-4.9/721-phy_packets.patch
b/target/linux/generic/hack-4.9/721-phy_packets.patch
index b25fdec47a4f54e90d5bbbd7184912e9fa10ec6c..d22c8730325f32845cd8f0f1fa1494562cb25650 100644
(file)
--- a/
target/linux/generic/hack-4.9/721-phy_packets.patch
+++ b/
target/linux/generic/hack-4.9/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
-@@ -1398,6 +1398,7 @@ enum netdev_priv_flags {
- IFF_RXFH_CONFIGURED = 1<<25,
+@@ -1400,6 +1400,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
-@@ -1427,6 +1428,7 @@ enum netdev_priv_flags {
- #define IFF_TEAM IFF_TEAM
+@@ -1430,6 +1431,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.
-@@ -171
3,6 +1715
,11 @@ struct net_device {
+@@ -171
6,6 +1718
,11 @@ struct net_device {
const struct ndisc_ops *ndisc_ops;
#endif
const struct ndisc_ops *ndisc_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;
-@@ -178
0,6 +1787
,10 @@ struct net_device {
+@@ -178
3,6 +1790
,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
struct mpls_dev __rcu *mpls_ptr;
#endif
@@
-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>
-@@ -5
29,6 +530
,22 @@ skb_fail:
+@@ -5
33,6 +534
,22 @@ skb_fail:
}
EXPORT_SYMBOL(__napi_alloc_skb);
}
EXPORT_SYMBOL(__napi_alloc_skb);