projects
/
openwrt
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update to 3.18.71
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
pending-3.18
/
721-phy_packets.patch
diff --git
a/target/linux/generic/pending-3.18/721-phy_packets.patch
b/target/linux/generic/pending-3.18/721-phy_packets.patch
index 99811c62428e3a1bbc1fe35c37359ee4b75156da..7235ab355f25c6fe95996030687c78904da3b1f7 100644
(file)
--- a/
target/linux/generic/pending-3.18/721-phy_packets.patch
+++ b/
target/linux/generic/pending-3.18/721-phy_packets.patch
@@
-41,7
+41,7
@@
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -205
4,6 +2054
,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -205
5,6 +2055
,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;
}
@@
-52,7
+52,7
@@
/**
* 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
-@@ -218
0,16 +2184
,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -218
1,16 +2185
,6 @@ static inline struct sk_buff *dev_alloc_
}
}
@@
-86,7
+86,7
@@
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
help
--- a/net/core/dev.c
+++ b/net/core/dev.c
-@@ -262
3,10 +2623
,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -262
6,10 +2626
,20 @@ static int xmit_one(struct sk_buff *skb,
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
if (!list_empty(&ptype_all))
dev_queue_xmit_nit(skb, dev);
@@
-121,7
+121,7
@@
#include <net/protocol.h>
#include <net/dst.h>
#include <net/protocol.h>
#include <net/dst.h>
-@@ -4
69,6 +470
,22 @@ struct sk_buff *__netdev_alloc_skb(struc
+@@ -4
71,6 +472
,22 @@ struct sk_buff *__netdev_alloc_skb(struc
}
EXPORT_SYMBOL(__netdev_alloc_skb);
}
EXPORT_SYMBOL(__netdev_alloc_skb);