kernel: bump 5.4 to 5.4.171
All patches automatically rebased. Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							0a852d8a5e
						
					
				
				
					commit
					53252c4ce9
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.4 = .170 | LINUX_VERSION-5.4 = .171 | ||||||
| LINUX_KERNEL_HASH-5.4.170 = b09f74e0cf5fc7cf5de6aa932fe654c962cb10118bdbbdddb397022c6e6d382c | LINUX_KERNEL_HASH-5.4.171 = afbcc8ed7d85485af299567f307b03057ffff3ec7bee02a21c33933d435b4958 | ||||||
|   | |||||||
| @@ -185,7 +185,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  		cfg->fc_flags |= RTF_REJECT; |  		cfg->fc_flags |= RTF_REJECT; | ||||||
|   |   | ||||||
|  	if (rtm->rtm_type == RTN_LOCAL) |  	if (rtm->rtm_type == RTN_LOCAL) | ||||||
| @@ -6056,6 +6087,8 @@ static int ip6_route_dev_notify(struct n | @@ -6084,6 +6115,8 @@ static int ip6_route_dev_notify(struct n | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  		net->ipv6.ip6_prohibit_entry->dst.dev = dev; |  		net->ipv6.ip6_prohibit_entry->dst.dev = dev; | ||||||
|  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); |  		net->ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(dev); | ||||||
| @@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev; |  		net->ipv6.ip6_blk_hole_entry->dst.dev = dev; | ||||||
|  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); |  		net->ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(dev); | ||||||
|  #endif |  #endif | ||||||
| @@ -6067,6 +6100,7 @@ static int ip6_route_dev_notify(struct n | @@ -6095,6 +6128,7 @@ static int ip6_route_dev_notify(struct n | ||||||
|  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); |  		in6_dev_put_clear(&net->ipv6.ip6_null_entry->rt6i_idev); | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); |  		in6_dev_put_clear(&net->ipv6.ip6_prohibit_entry->rt6i_idev); | ||||||
| @@ -202,7 +202,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); |  		in6_dev_put_clear(&net->ipv6.ip6_blk_hole_entry->rt6i_idev); | ||||||
|  #endif |  #endif | ||||||
|  	} |  	} | ||||||
| @@ -6259,6 +6293,8 @@ static int __net_init ip6_route_net_init | @@ -6287,6 +6321,8 @@ static int __net_init ip6_route_net_init | ||||||
|   |   | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  	net->ipv6.fib6_has_custom_rules = false; |  	net->ipv6.fib6_has_custom_rules = false; | ||||||
| @@ -211,7 +211,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, |  	net->ipv6.ip6_prohibit_entry = kmemdup(&ip6_prohibit_entry_template, | ||||||
|  					       sizeof(*net->ipv6.ip6_prohibit_entry), |  					       sizeof(*net->ipv6.ip6_prohibit_entry), | ||||||
|  					       GFP_KERNEL); |  					       GFP_KERNEL); | ||||||
| @@ -6269,11 +6305,21 @@ static int __net_init ip6_route_net_init | @@ -6297,11 +6333,21 @@ static int __net_init ip6_route_net_init | ||||||
|  			 ip6_template_metrics, true); |  			 ip6_template_metrics, true); | ||||||
|  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); |  	INIT_LIST_HEAD(&net->ipv6.ip6_prohibit_entry->rt6i_uncached); | ||||||
|   |   | ||||||
| @@ -234,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; |  	net->ipv6.ip6_blk_hole_entry->dst.ops = &net->ipv6.ip6_dst_ops; | ||||||
|  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, |  	dst_init_metrics(&net->ipv6.ip6_blk_hole_entry->dst, | ||||||
|  			 ip6_template_metrics, true); |  			 ip6_template_metrics, true); | ||||||
| @@ -6297,6 +6343,8 @@ out: | @@ -6325,6 +6371,8 @@ out: | ||||||
|  	return ret; |  	return ret; | ||||||
|   |   | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
| @@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  out_ip6_prohibit_entry: |  out_ip6_prohibit_entry: | ||||||
|  	kfree(net->ipv6.ip6_prohibit_entry); |  	kfree(net->ipv6.ip6_prohibit_entry); | ||||||
|  out_ip6_null_entry: |  out_ip6_null_entry: | ||||||
| @@ -6316,6 +6364,7 @@ static void __net_exit ip6_route_net_exi | @@ -6344,6 +6392,7 @@ static void __net_exit ip6_route_net_exi | ||||||
|  	kfree(net->ipv6.ip6_null_entry); |  	kfree(net->ipv6.ip6_null_entry); | ||||||
|  #ifdef CONFIG_IPV6_MULTIPLE_TABLES |  #ifdef CONFIG_IPV6_MULTIPLE_TABLES | ||||||
|  	kfree(net->ipv6.ip6_prohibit_entry); |  	kfree(net->ipv6.ip6_prohibit_entry); | ||||||
| @@ -251,7 +251,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  	kfree(net->ipv6.ip6_blk_hole_entry); |  	kfree(net->ipv6.ip6_blk_hole_entry); | ||||||
|  #endif |  #endif | ||||||
|  	dst_entries_destroy(&net->ipv6.ip6_dst_ops); |  	dst_entries_destroy(&net->ipv6.ip6_dst_ops); | ||||||
| @@ -6393,6 +6442,9 @@ void __init ip6_route_init_special_entri | @@ -6421,6 +6470,9 @@ void __init ip6_route_init_special_entri | ||||||
|  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); |  	init_net.ipv6.ip6_prohibit_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||||||
|  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; |  	init_net.ipv6.ip6_blk_hole_entry->dst.dev = init_net.loopback_dev; | ||||||
|  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); |  	init_net.ipv6.ip6_blk_hole_entry->rt6i_idev = in6_dev_get(init_net.loopback_dev); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user