kernel: bump 5.10 to 5.10.176
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit f598880162)
			
			
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							a4212b77c0
						
					
				
				
					commit
					f61c5cf76b
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.10 = .175 | LINUX_VERSION-5.10 = .176 | ||||||
| LINUX_KERNEL_HASH-5.10.175 = e277562e28f234e36665ae12b7585f9557a83a86bc4a8de8840a305af6307bce | LINUX_KERNEL_HASH-5.10.176 = ce072c60ba04173e05b2a1de3fefdeba5ac8b28b1958d92d21bdbf9b736ef793 | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -354,6 +354,7 @@ struct napi_struct { | @@ -356,6 +356,7 @@ struct napi_struct { | ||||||
|  	struct list_head	dev_list; |  	struct list_head	dev_list; | ||||||
|  	struct hlist_node	napi_hash_node; |  	struct hlist_node	napi_hash_node; | ||||||
|  	unsigned int		napi_id; |  	unsigned int		napi_id; | ||||||
| @@ -38,7 +38,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -364,6 +365,7 @@ enum { | @@ -366,6 +367,7 @@ enum { | ||||||
|  	NAPI_STATE_LISTED,	/* NAPI added to system lists */ |  	NAPI_STATE_LISTED,	/* NAPI added to system lists */ | ||||||
|  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ |  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ | ||||||
|  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ |  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ | ||||||
| @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -374,6 +376,7 @@ enum { | @@ -376,6 +378,7 @@ enum { | ||||||
|  	NAPIF_STATE_LISTED	 = BIT(NAPI_STATE_LISTED), |  	NAPIF_STATE_LISTED	 = BIT(NAPI_STATE_LISTED), | ||||||
|  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), |  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), | ||||||
|  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), |  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), | ||||||
| @@ -54,7 +54,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum gro_result { |  enum gro_result { | ||||||
| @@ -504,20 +507,7 @@ static inline bool napi_complete(struct | @@ -506,20 +509,7 @@ static inline bool napi_complete(struct | ||||||
|   */ |   */ | ||||||
|  void napi_disable(struct napi_struct *n); |  void napi_disable(struct napi_struct *n); | ||||||
|   |   | ||||||
| @@ -76,7 +76,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   |   | ||||||
|  /** |  /** | ||||||
|   *	napi_synchronize - wait until NAPI is not running |   *	napi_synchronize - wait until NAPI is not running | ||||||
| @@ -1863,6 +1853,8 @@ enum netdev_ml_priv_type { | @@ -1865,6 +1855,8 @@ enum netdev_ml_priv_type { | ||||||
|   * |   * | ||||||
|   *	@wol_enabled:	Wake-on-LAN is enabled |   *	@wol_enabled:	Wake-on-LAN is enabled | ||||||
|   * |   * | ||||||
| @@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
|   *	@net_notifier_list:	List of per-net netdev notifier block |   *	@net_notifier_list:	List of per-net netdev notifier block | ||||||
|   *				that follow this device when it is moved |   *				that follow this device when it is moved | ||||||
|   *				to another network namespace. |   *				to another network namespace. | ||||||
| @@ -2182,6 +2174,7 @@ struct net_device { | @@ -2184,6 +2176,7 @@ struct net_device { | ||||||
|  	struct lock_class_key	*qdisc_running_key; |  	struct lock_class_key	*qdisc_running_key; | ||||||
|  	bool			proto_down; |  	bool			proto_down; | ||||||
|  	unsigned		wol_enabled:1; |  	unsigned		wol_enabled:1; | ||||||
|   | |||||||
| @@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> | |||||||
| +		== ================================== | +		== ================================== | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -498,6 +498,8 @@ static inline bool napi_complete(struct | @@ -500,6 +500,8 @@ static inline bool napi_complete(struct | ||||||
|  	return napi_complete_done(n, 0); |  	return napi_complete_done(n, 0); | ||||||
|  } |  } | ||||||
|   |   | ||||||
|   | |||||||
| @@ -27,7 +27,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -366,6 +366,7 @@ enum { | @@ -368,6 +368,7 @@ enum { | ||||||
|  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ |  	NAPI_STATE_NO_BUSY_POLL,/* Do not add in napi_hash, no busy polling */ | ||||||
|  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ |  	NAPI_STATE_IN_BUSY_POLL,/* sk_busy_loop() owns this NAPI */ | ||||||
|  	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/ |  	NAPI_STATE_THREADED,		/* The poll is performed inside its own thread*/ | ||||||
| @@ -35,7 +35,7 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  enum { |  enum { | ||||||
| @@ -377,6 +378,7 @@ enum { | @@ -379,6 +380,7 @@ enum { | ||||||
|  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), |  	NAPIF_STATE_NO_BUSY_POLL = BIT(NAPI_STATE_NO_BUSY_POLL), | ||||||
|  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), |  	NAPIF_STATE_IN_BUSY_POLL = BIT(NAPI_STATE_IN_BUSY_POLL), | ||||||
|  	NAPIF_STATE_THREADED	 = BIT(NAPI_STATE_THREADED), |  	NAPIF_STATE_THREADED	 = BIT(NAPI_STATE_THREADED), | ||||||
|   | |||||||
| @@ -58,7 +58,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -848,6 +848,27 @@ typedef u16 (*select_queue_fallback_t)(s | @@ -850,6 +850,27 @@ typedef u16 (*select_queue_fallback_t)(s | ||||||
|  				       struct sk_buff *skb, |  				       struct sk_buff *skb, | ||||||
|  				       struct net_device *sb_dev); |  				       struct net_device *sb_dev); | ||||||
|   |   | ||||||
| @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  enum tc_setup_type { |  enum tc_setup_type { | ||||||
|  	TC_SETUP_QDISC_MQPRIO, |  	TC_SETUP_QDISC_MQPRIO, | ||||||
|  	TC_SETUP_CLSU32, |  	TC_SETUP_CLSU32, | ||||||
| @@ -1294,6 +1315,8 @@ struct netdev_net_notifier { | @@ -1296,6 +1317,8 @@ struct netdev_net_notifier { | ||||||
|   * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev); |   * struct net_device *(*ndo_get_peer_dev)(struct net_device *dev); | ||||||
|   *	If a device is paired with a peer device, return the peer instance. |   *	If a device is paired with a peer device, return the peer instance. | ||||||
|   *	The caller must be under RCU read context. |   *	The caller must be under RCU read context. | ||||||
| @@ -95,7 +95,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|   */ |   */ | ||||||
|  struct net_device_ops { |  struct net_device_ops { | ||||||
|  	int			(*ndo_init)(struct net_device *dev); |  	int			(*ndo_init)(struct net_device *dev); | ||||||
| @@ -1502,6 +1525,8 @@ struct net_device_ops { | @@ -1504,6 +1527,8 @@ struct net_device_ops { | ||||||
|  	int			(*ndo_tunnel_ctl)(struct net_device *dev, |  	int			(*ndo_tunnel_ctl)(struct net_device *dev, | ||||||
|  						  struct ip_tunnel_parm *p, int cmd); |  						  struct ip_tunnel_parm *p, int cmd); | ||||||
|  	struct net_device *	(*ndo_get_peer_dev)(struct net_device *dev); |  	struct net_device *	(*ndo_get_peer_dev)(struct net_device *dev); | ||||||
| @@ -104,7 +104,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  /** |  /** | ||||||
| @@ -2849,6 +2874,8 @@ void dev_remove_offload(struct packet_of | @@ -2851,6 +2876,8 @@ void dev_remove_offload(struct packet_of | ||||||
|   |   | ||||||
|  int dev_get_iflink(const struct net_device *dev); |  int dev_get_iflink(const struct net_device *dev); | ||||||
|  int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); |  int dev_fill_metadata_dst(struct net_device *dev, struct sk_buff *skb); | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -850,11 +850,18 @@ typedef u16 (*select_queue_fallback_t)(s | @@ -852,11 +852,18 @@ typedef u16 (*select_queue_fallback_t)(s | ||||||
|   |   | ||||||
|  enum net_device_path_type { |  enum net_device_path_type { | ||||||
|  	DEV_PATH_ETHERNET = 0, |  	DEV_PATH_ETHERNET = 0, | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -851,6 +851,7 @@ typedef u16 (*select_queue_fallback_t)(s | @@ -853,6 +853,7 @@ typedef u16 (*select_queue_fallback_t)(s | ||||||
|  enum net_device_path_type { |  enum net_device_path_type { | ||||||
|  	DEV_PATH_ETHERNET = 0, |  	DEV_PATH_ETHERNET = 0, | ||||||
|  	DEV_PATH_VLAN, |  	DEV_PATH_VLAN, | ||||||
|   | |||||||
| @@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -862,10 +862,20 @@ struct net_device_path { | @@ -864,10 +864,20 @@ struct net_device_path { | ||||||
|  			u16		id; |  			u16		id; | ||||||
|  			__be16		proto; |  			__be16		proto; | ||||||
|  		} encap; |  		} encap; | ||||||
| @@ -36,7 +36,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|   |   | ||||||
|  struct net_device_path_stack { |  struct net_device_path_stack { | ||||||
|  	int			num_paths; |  	int			num_paths; | ||||||
| @@ -875,6 +885,12 @@ struct net_device_path_stack { | @@ -877,6 +887,12 @@ struct net_device_path_stack { | ||||||
|  struct net_device_path_ctx { |  struct net_device_path_ctx { | ||||||
|  	const struct net_device *dev; |  	const struct net_device *dev; | ||||||
|  	const u8		*daddr; |  	const u8		*daddr; | ||||||
|   | |||||||
| @@ -83,7 +83,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, |  static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -852,6 +852,7 @@ enum net_device_path_type { | @@ -854,6 +854,7 @@ enum net_device_path_type { | ||||||
|  	DEV_PATH_ETHERNET = 0, |  	DEV_PATH_ETHERNET = 0, | ||||||
|  	DEV_PATH_VLAN, |  	DEV_PATH_VLAN, | ||||||
|  	DEV_PATH_BRIDGE, |  	DEV_PATH_BRIDGE, | ||||||
| @@ -91,7 +91,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  struct net_device_path { |  struct net_device_path { | ||||||
| @@ -861,6 +862,7 @@ struct net_device_path { | @@ -863,6 +864,7 @@ struct net_device_path { | ||||||
|  		struct { |  		struct { | ||||||
|  			u16		id; |  			u16		id; | ||||||
|  			__be16		proto; |  			__be16		proto; | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -853,6 +853,7 @@ enum net_device_path_type { | @@ -855,6 +855,7 @@ enum net_device_path_type { | ||||||
|  	DEV_PATH_VLAN, |  	DEV_PATH_VLAN, | ||||||
|  	DEV_PATH_BRIDGE, |  	DEV_PATH_BRIDGE, | ||||||
|  	DEV_PATH_PPPOE, |  	DEV_PATH_PPPOE, | ||||||
| @@ -18,7 +18,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  struct net_device_path { |  struct net_device_path { | ||||||
| @@ -873,6 +874,10 @@ struct net_device_path { | @@ -875,6 +876,10 @@ struct net_device_path { | ||||||
|  			u16		vlan_id; |  			u16		vlan_id; | ||||||
|  			__be16		vlan_proto; |  			__be16		vlan_proto; | ||||||
|  		} bridge; |  		} bridge; | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -870,6 +870,7 @@ struct net_device_path { | @@ -872,6 +872,7 @@ struct net_device_path { | ||||||
|  				DEV_PATH_BR_VLAN_KEEP, |  				DEV_PATH_BR_VLAN_KEEP, | ||||||
|  				DEV_PATH_BR_VLAN_TAG, |  				DEV_PATH_BR_VLAN_TAG, | ||||||
|  				DEV_PATH_BR_VLAN_UNTAG, |  				DEV_PATH_BR_VLAN_UNTAG, | ||||||
|   | |||||||
| @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -1646,6 +1646,7 @@ enum netdev_priv_flags { | @@ -1648,6 +1648,7 @@ enum netdev_priv_flags { | ||||||
|  	IFF_FAILOVER_SLAVE		= 1<<28, |  	IFF_FAILOVER_SLAVE		= 1<<28, | ||||||
|  	IFF_L3MDEV_RX_HANDLER		= 1<<29, |  	IFF_L3MDEV_RX_HANDLER		= 1<<29, | ||||||
|  	IFF_LIVE_RENAME_OK		= 1<<30, |  	IFF_LIVE_RENAME_OK		= 1<<30, | ||||||
| @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN |  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN | ||||||
| @@ -1678,6 +1679,7 @@ enum netdev_priv_flags { | @@ -1680,6 +1681,7 @@ enum netdev_priv_flags { | ||||||
|  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE |  #define IFF_FAILOVER_SLAVE		IFF_FAILOVER_SLAVE | ||||||
|  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER |  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER | ||||||
|  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK |  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK | ||||||
| @@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
|  /* Specifies the type of the struct net_device::ml_priv pointer */ |  /* Specifies the type of the struct net_device::ml_priv pointer */ | ||||||
|  enum netdev_ml_priv_type { |  enum netdev_ml_priv_type { | ||||||
| @@ -2018,6 +2020,11 @@ struct net_device { | @@ -2020,6 +2022,11 @@ struct net_device { | ||||||
|  	const struct tlsdev_ops *tlsdev_ops; |  	const struct tlsdev_ops *tlsdev_ops; | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  	const struct header_ops *header_ops; |  	const struct header_ops *header_ops; | ||||||
|   |   | ||||||
|  	unsigned int		flags; |  	unsigned int		flags; | ||||||
| @@ -2108,6 +2115,10 @@ struct net_device { | @@ -2110,6 +2117,10 @@ struct net_device { | ||||||
|  	struct mpls_dev __rcu	*mpls_ptr; |  	struct mpls_dev __rcu	*mpls_ptr; | ||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
|   | |||||||
| @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -2057,6 +2057,8 @@ struct net_device { | @@ -2059,6 +2059,8 @@ struct net_device { | ||||||
|  	struct netdev_hw_addr_list	mc; |  	struct netdev_hw_addr_list	mc; | ||||||
|  	struct netdev_hw_addr_list	dev_addrs; |  	struct netdev_hw_addr_list	dev_addrs; | ||||||
|   |   | ||||||
|   | |||||||
| @@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  static inline void |  static inline void | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -854,6 +854,7 @@ enum net_device_path_type { | @@ -856,6 +856,7 @@ enum net_device_path_type { | ||||||
|  	DEV_PATH_BRIDGE, |  	DEV_PATH_BRIDGE, | ||||||
|  	DEV_PATH_PPPOE, |  	DEV_PATH_PPPOE, | ||||||
|  	DEV_PATH_DSA, |  	DEV_PATH_DSA, | ||||||
| @@ -241,7 +241,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  }; |  }; | ||||||
|   |   | ||||||
|  struct net_device_path { |  struct net_device_path { | ||||||
| @@ -879,6 +880,12 @@ struct net_device_path { | @@ -881,6 +882,12 @@ struct net_device_path { | ||||||
|  			int port; |  			int port; | ||||||
|  			u16 proto; |  			u16 proto; | ||||||
|  		} dsa; |  		} dsa; | ||||||
|   | |||||||
| @@ -40,7 +40,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -899,7 +899,7 @@ struct net_device_path_stack { | @@ -901,7 +901,7 @@ struct net_device_path_stack { | ||||||
|   |   | ||||||
|  struct net_device_path_ctx { |  struct net_device_path_ctx { | ||||||
|  	const struct net_device *dev; |  	const struct net_device *dev; | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: DENG Qingfang <dqfext@gmail.com> | |||||||
|  |  | ||||||
| --- a/drivers/net/dsa/mv88e6xxx/chip.c | --- a/drivers/net/dsa/mv88e6xxx/chip.c | ||||||
| +++ b/drivers/net/dsa/mv88e6xxx/chip.c | +++ b/drivers/net/dsa/mv88e6xxx/chip.c | ||||||
| @@ -2873,6 +2873,7 @@ static int mv88e6xxx_setup(struct dsa_sw | @@ -2881,6 +2881,7 @@ static int mv88e6xxx_setup(struct dsa_sw | ||||||
|   |   | ||||||
|  	chip->ds = ds; |  	chip->ds = ds; | ||||||
|  	ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); |  	ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); | ||||||
|   | |||||||
| @@ -17,7 +17,7 @@ Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com> | |||||||
|  |  | ||||||
| --- a/drivers/net/dsa/mv88e6xxx/chip.c | --- a/drivers/net/dsa/mv88e6xxx/chip.c | ||||||
| +++ b/drivers/net/dsa/mv88e6xxx/chip.c | +++ b/drivers/net/dsa/mv88e6xxx/chip.c | ||||||
| @@ -5442,6 +5442,7 @@ static int mv88e6xxx_register_switch(str | @@ -5450,6 +5450,7 @@ static int mv88e6xxx_register_switch(str | ||||||
|  	ds->ops = &mv88e6xxx_switch_ops; |  	ds->ops = &mv88e6xxx_switch_ops; | ||||||
|  	ds->ageing_time_min = chip->info->age_time_coeff; |  	ds->ageing_time_min = chip->info->age_time_coeff; | ||||||
|  	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; |  	ds->ageing_time_max = chip->info->age_time_coeff * U8_MAX; | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org> | |||||||
|  |  | ||||||
| --- a/include/linux/netdevice.h | --- a/include/linux/netdevice.h | ||||||
| +++ b/include/linux/netdevice.h | +++ b/include/linux/netdevice.h | ||||||
| @@ -786,6 +786,16 @@ struct xps_map { | @@ -788,6 +788,16 @@ struct xps_map { | ||||||
|  #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \ |  #define XPS_MIN_MAP_ALLOC ((L1_CACHE_ALIGN(offsetof(struct xps_map, queues[1])) \ | ||||||
|         - sizeof(struct xps_map)) / sizeof(u16)) |         - sizeof(struct xps_map)) / sizeof(u16)) | ||||||
|   |   | ||||||
| @@ -41,7 +41,7 @@ Reviewed-by: Grant Grundler <grundler@chromium.org> | |||||||
|  /* |  /* | ||||||
|   * This structure holds all XPS maps for device.  Maps are indexed by CPU. |   * This structure holds all XPS maps for device.  Maps are indexed by CPU. | ||||||
|   */ |   */ | ||||||
| @@ -1473,6 +1483,9 @@ struct net_device_ops { | @@ -1475,6 +1485,9 @@ struct net_device_ops { | ||||||
|  						     const struct sk_buff *skb, |  						     const struct sk_buff *skb, | ||||||
|  						     u16 rxq_index, |  						     u16 rxq_index, | ||||||
|  						     u32 flow_id); |  						     u32 flow_id); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user