kernel: bump 4.9 to 4.9.134
Refreshed all patches. Compile-tested on: ar71xx, layerscape Runtime-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
@@ -546,7 +546,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
{
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -903,6 +903,7 @@ void kfree_skb(struct sk_buff *skb);
|
||||
@@ -908,6 +908,7 @@ void kfree_skb(struct sk_buff *skb);
|
||||
void kfree_skb_list(struct sk_buff *segs);
|
||||
void skb_tx_error(struct sk_buff *skb);
|
||||
void consume_skb(struct sk_buff *skb);
|
||||
@@ -554,7 +554,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
void __kfree_skb(struct sk_buff *skb);
|
||||
extern struct kmem_cache *skbuff_head_cache;
|
||||
|
||||
@@ -3059,6 +3060,7 @@ static inline void skb_free_datagram_loc
|
||||
@@ -3081,6 +3082,7 @@ static inline void skb_free_datagram_loc
|
||||
}
|
||||
int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags);
|
||||
int skb_copy_bits(const struct sk_buff *skb, int offset, void *to, int len);
|
||||
@@ -1273,7 +1273,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
+}
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -1968,6 +1968,23 @@ static void netif_setup_tc(struct net_de
|
||||
@@ -1990,6 +1990,23 @@ static void netif_setup_tc(struct net_de
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1297,7 +1297,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
#ifdef CONFIG_XPS
|
||||
static DEFINE_MUTEX(xps_map_mutex);
|
||||
#define xmap_dereference(P) \
|
||||
@@ -6630,9 +6647,18 @@ int dev_set_mtu(struct net_device *dev,
|
||||
@@ -6652,9 +6669,18 @@ int dev_set_mtu(struct net_device *dev,
|
||||
if (new_mtu == dev->mtu)
|
||||
return 0;
|
||||
|
||||
@@ -1370,7 +1370,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
&queue_tx_maxrate.attr,
|
||||
--- a/net/core/rtnetlink.c
|
||||
+++ b/net/core/rtnetlink.c
|
||||
@@ -3690,7 +3690,7 @@ static int rtnl_get_offload_stats(struct
|
||||
@@ -3696,7 +3696,7 @@ static int rtnl_get_offload_stats(struct
|
||||
if (!size)
|
||||
continue;
|
||||
|
||||
@@ -1379,7 +1379,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
||||
continue;
|
||||
|
||||
attr = nla_reserve_64bit(skb, attr_id, size,
|
||||
@@ -3731,7 +3731,7 @@ static int rtnl_get_offload_stats_size(c
|
||||
@@ -3737,7 +3737,7 @@ static int rtnl_get_offload_stats_size(c
|
||||
|
||||
for (attr_id = IFLA_OFFLOAD_XSTATS_FIRST;
|
||||
attr_id <= IFLA_OFFLOAD_XSTATS_MAX; attr_id++) {
|
||||
|
||||
Reference in New Issue
Block a user