diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2016-09-15 15:27:45 +0200 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2016-10-24 20:25:14 +0300 |
| commit | 2fc3680dd066419576cb0129d0c1bd7618b90f1a (patch) | |
| tree | f5956c394aedc3bb3a6a5f45e1d1ddc658d3dc58 /target/linux/generic/patches-4.1/721-phy_packets.patch | |
| parent | 06405df7a8da24b7d735b32454c7d3b1f2ebaabc (diff) | |
| download | upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.gz upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.tar.bz2 upstream-2fc3680dd066419576cb0129d0c1bd7618b90f1a.zip | |
kernel: update kernel 4.1 to version 4.1.34
Refresh patches for all targets supporting 4.1 and not marked broken.
Compile-tested on all targets using 4.1 and not marked broken.
Changes to generic/610-netfilter_match_bypass_default_checks.patch based
on 84d489f64f3b382d5544e342f66d8806e94e85d3.
Changes to generic/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch based
on a90ee92337d60fd14b6431adcda9929b955f3408.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/generic/patches-4.1/721-phy_packets.patch')
| -rw-r--r-- | target/linux/generic/patches-4.1/721-phy_packets.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/patches-4.1/721-phy_packets.patch b/target/linux/generic/patches-4.1/721-phy_packets.patch index 3a963b5d69..ecf1851dfb 100644 --- a/target/linux/generic/patches-4.1/721-phy_packets.patch +++ b/target/linux/generic/patches-4.1/721-phy_packets.patch @@ -1,6 +1,6 @@ --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -1270,6 +1270,7 @@ enum netdev_priv_flags { +@@ -1271,6 +1271,7 @@ enum netdev_priv_flags { IFF_XMIT_DST_RELEASE_PERM = 1<<22, IFF_IPVLAN_MASTER = 1<<23, IFF_IPVLAN_SLAVE = 1<<24, @@ -8,7 +8,7 @@ }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN -@@ -1297,6 +1298,7 @@ enum netdev_priv_flags { +@@ -1298,6 +1299,7 @@ enum netdev_priv_flags { #define IFF_XMIT_DST_RELEASE_PERM IFF_XMIT_DST_RELEASE_PERM #define IFF_IPVLAN_MASTER IFF_IPVLAN_MASTER #define IFF_IPVLAN_SLAVE IFF_IPVLAN_SLAVE @@ -16,7 +16,7 @@ /** * struct net_device - The DEVICE structure. -@@ -1567,6 +1569,11 @@ struct net_device { +@@ -1568,6 +1570,11 @@ struct net_device { const struct swdev_ops *swdev_ops; #endif @@ -28,7 +28,7 @@ const struct header_ops *header_ops; unsigned int flags; -@@ -1633,6 +1640,10 @@ struct net_device { +@@ -1634,6 +1641,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif @@ -41,7 +41,7 @@ */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -2059,6 +2059,10 @@ static inline int pskb_trim(struct sk_bu +@@ -2083,6 +2083,10 @@ static inline int pskb_trim(struct sk_bu 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 -@@ -2185,16 +2189,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -2209,16 +2213,6 @@ static inline struct sk_buff *dev_alloc_ } |