generic: 6.1: refresh hack patches
Refresh hack patches with make target/linux/refresh. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
		| @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  | ||||
| --- a/include/linux/netdevice.h | ||||
| +++ b/include/linux/netdevice.h | ||||
| @@ -1655,6 +1655,7 @@ enum netdev_priv_flags { | ||||
| @@ -1704,6 +1704,7 @@ enum netdev_priv_flags { | ||||
|  	IFF_LIVE_RENAME_OK		= 1<<30, | ||||
|  	IFF_TX_SKB_NO_LINEAR		= BIT_ULL(31), | ||||
|  	IFF_CHANGE_PROTO_DOWN		= BIT_ULL(32), | ||||
| @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  }; | ||||
|   | ||||
|  #define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN | ||||
| @@ -1687,6 +1691,7 @@ enum netdev_priv_flags { | ||||
| @@ -1738,6 +1739,7 @@ enum netdev_priv_flags { | ||||
|  #define IFF_L3MDEV_RX_HANDLER		IFF_L3MDEV_RX_HANDLER | ||||
|  #define IFF_LIVE_RENAME_OK		IFF_LIVE_RENAME_OK | ||||
|  #define IFF_TX_SKB_NO_LINEAR		IFF_TX_SKB_NO_LINEAR | ||||
| @@ -35,7 +35,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|   | ||||
|  /* Specifies the type of the struct net_device::ml_priv pointer */ | ||||
|  enum netdev_ml_priv_type { | ||||
| @@ -2048,6 +2054,11 @@ struct net_device { | ||||
| @@ -2106,6 +2108,11 @@ struct net_device { | ||||
|  	const struct tlsdev_ops *tlsdev_ops; | ||||
|  #endif | ||||
|   | ||||
| @@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  	const struct header_ops *header_ops; | ||||
|   | ||||
|  	unsigned char		operstate; | ||||
| @@ -2122,6 +2133,10 @@ struct net_device { | ||||
| @@ -2181,6 +2188,10 @@ struct net_device { | ||||
|  	struct mctp_dev __rcu	*mctp_ptr; | ||||
|  #endif | ||||
|   | ||||
| @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|   */ | ||||
| --- a/include/linux/skbuff.h | ||||
| +++ b/include/linux/skbuff.h | ||||
| @@ -2816,6 +2816,10 @@ static inline int pskb_trim(struct sk_bu | ||||
| @@ -3022,6 +3022,10 @@ static inline int pskb_trim(struct sk_bu | ||||
|  	return (len < skb->len) ? __pskb_trim(skb, len) : 0; | ||||
|  } | ||||
|   | ||||
| @@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  /** | ||||
|   *	pskb_trim_unique - remove end from a paged unique (not cloned) buffer | ||||
|   *	@skb: buffer to alter | ||||
| @@ -2966,16 +2970,6 @@ static inline struct sk_buff *dev_alloc_ | ||||
| @@ -3171,16 +3175,6 @@ static inline struct sk_buff *dev_alloc_ | ||||
|  } | ||||
|   | ||||
|   | ||||
| @@ -105,7 +105,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  	help | ||||
| --- a/net/core/dev.c | ||||
| +++ b/net/core/dev.c | ||||
| @@ -3590,6 +3590,11 @@ static int xmit_one(struct sk_buff *skb, | ||||
| @@ -3588,6 +3588,11 @@ static int xmit_one(struct sk_buff *skb, | ||||
|  	if (dev_nit_active(dev)) | ||||
|  		dev_queue_xmit_nit(skb, dev); | ||||
|   | ||||
| @@ -127,7 +127,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|   | ||||
|  #include <net/protocol.h> | ||||
|  #include <net/dst.h> | ||||
| @@ -602,6 +603,22 @@ skb_fail: | ||||
| @@ -707,6 +708,22 @@ skb_fail: | ||||
|  } | ||||
|  EXPORT_SYMBOL(__napi_alloc_skb); | ||||
|   | ||||
| @@ -152,7 +152,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | ||||
|  { | ||||
| --- a/net/ethernet/eth.c | ||||
| +++ b/net/ethernet/eth.c | ||||
| @@ -170,6 +170,12 @@ __be16 eth_type_trans(struct sk_buff *sk | ||||
| @@ -171,6 +171,12 @@ __be16 eth_type_trans(struct sk_buff *sk | ||||
|  	const struct ethhdr *eth; | ||||
|   | ||||
|  	skb->dev = dev; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Christian Marangi
					Christian Marangi