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.162
[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 fb977b10d4d452f1248e92c97403b9c054f7fbef..52910fceeb023289b166f3ba379aba5b93a7bd37 100644
(file)
--- a/
target/linux/generic/hack-4.14/721-phy_packets.patch
+++ b/
target/linux/generic/hack-4.14/721-phy_packets.patch
@@
-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
797,6 +1804
,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
-@@ -25
12,6 +251
2,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -25
32,6 +253
2,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
42,16 +2646
,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -26
63,16 +2667
,6 @@ static inline struct sk_buff *dev_alloc_
}
}
@@
-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);