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 kernel 4.4 to version 4.4.79
[openwrt/openwrt.git]
/
target
/
linux
/
generic
/
patches-4.4
/
721-phy_packets.patch
diff --git
a/target/linux/generic/patches-4.4/721-phy_packets.patch
b/target/linux/generic/patches-4.4/721-phy_packets.patch
index c3fbb955b82c9f619f5707cf8577b8f80a35f8c1..b163684c69ff572870f6c3988896e7c7a71f48c2 100644
(file)
--- a/
target/linux/generic/patches-4.4/721-phy_packets.patch
+++ b/
target/linux/generic/patches-4.4/721-phy_packets.patch
@@
-1,6
+1,6
@@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -129
8,6 +1298
,7 @@ enum netdev_priv_flags {
+@@ -129
7,6 +1297
,7 @@ enum netdev_priv_flags {
IFF_NO_QUEUE = 1<<21,
IFF_OPENVSWITCH = 1<<22,
IFF_L3MDEV_SLAVE = 1<<23,
IFF_NO_QUEUE = 1<<21,
IFF_OPENVSWITCH = 1<<22,
IFF_L3MDEV_SLAVE = 1<<23,
@@
-8,7
+8,7
@@
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
};
#define IFF_802_1Q_VLAN IFF_802_1Q_VLAN
-@@ -132
4,6 +1325
,7 @@ enum netdev_priv_flags {
+@@ -132
3,6 +1324
,7 @@ enum netdev_priv_flags {
#define IFF_NO_QUEUE IFF_NO_QUEUE
#define IFF_OPENVSWITCH IFF_OPENVSWITCH
#define IFF_L3MDEV_SLAVE IFF_L3MDEV_SLAVE
#define IFF_NO_QUEUE IFF_NO_QUEUE
#define IFF_OPENVSWITCH IFF_OPENVSWITCH
#define IFF_L3MDEV_SLAVE IFF_L3MDEV_SLAVE
@@
-28,7
+28,7
@@
const struct header_ops *header_ops;
unsigned int flags;
const struct header_ops *header_ops;
unsigned int flags;
-@@ -16
69,6 +1676
,10 @@ struct net_device {
+@@ -16
70,6 +1677
,10 @@ struct net_device {
struct mpls_dev __rcu *mpls_ptr;
#endif
struct mpls_dev __rcu *mpls_ptr;
#endif
@@
-41,7
+41,7
@@
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
*/
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
-@@ -22
11,6 +2211
,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -22
08,6 +2208
,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
-@@ -231
5,16 +2319
,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -231
2,16 +2316
,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
-@@ -27
13,10 +2713
,20 @@ static int xmit_one(struct sk_buff *skb,
+@@ -27
36,10 +2736
,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);