mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-19 05:38:00 +00:00
kernel: refresh backport-5.15 patches
Refresh patches, removing unwanted git metadata from some backported commits. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
parent
f6c359a655
commit
05501304ed
@ -29,8 +29,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
net/core/page_pool.c | 24 ++++++++++++++++++++----
|
||||
3 files changed, 51 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/net/page_pool.h b/include/net/page_pool.h
|
||||
index 97c3c19872ff..1f27e8a48830 100644
|
||||
--- a/include/net/page_pool.h
|
||||
+++ b/include/net/page_pool.h
|
||||
@@ -82,6 +82,19 @@ struct page_pool_params {
|
||||
|
@ -19,8 +19,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
net/core/page_pool.c | 30 ++++++++++++++++++++++++++++--
|
||||
2 files changed, 44 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/net/page_pool.h b/include/net/page_pool.h
|
||||
index 1f27e8a48830..298af95bbf96 100644
|
||||
--- a/include/net/page_pool.h
|
||||
+++ b/include/net/page_pool.h
|
||||
@@ -93,6 +93,18 @@ struct page_pool_alloc_stats {
|
||||
|
@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
net/core/page_pool.c | 25 +++++++++++++++++++++++++
|
||||
2 files changed, 42 insertions(+)
|
||||
|
||||
diff --git a/include/net/page_pool.h b/include/net/page_pool.h
|
||||
index 298af95bbf96..ea5fb70e5101 100644
|
||||
--- a/include/net/page_pool.h
|
||||
+++ b/include/net/page_pool.h
|
||||
@@ -105,6 +105,23 @@ struct page_pool_recycle_stats {
|
||||
|
@ -14,8 +14,6 @@ Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
||||
net/core/page_pool.c | 15 +++++++++++++--
|
||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/net/core/page_pool.c b/net/core/page_pool.c
|
||||
index 1943c0f0307d..4af55d28ffa3 100644
|
||||
--- a/net/core/page_pool.c
|
||||
+++ b/net/core/page_pool.c
|
||||
@@ -36,6 +36,12 @@
|
||||
|
@ -15,8 +15,6 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
net/core/page_pool.c | 63 ++++++++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 83 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/net/page_pool.h b/include/net/page_pool.h
|
||||
index ea5fb70e5101..813c93499f20 100644
|
||||
--- a/include/net/page_pool.h
|
||||
+++ b/include/net/page_pool.h
|
||||
@@ -115,6 +115,10 @@ struct page_pool_stats {
|
||||
|
@ -22,8 +22,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
||||
include/net/xdp.h | 29 +++++++++++++++++++++++++++++
|
||||
1 file changed, 29 insertions(+)
|
||||
|
||||
diff --git a/include/net/xdp.h b/include/net/xdp.h
|
||||
index 8f0812e4996d..485e9495a690 100644
|
||||
--- a/include/net/xdp.h
|
||||
+++ b/include/net/xdp.h
|
||||
@@ -66,6 +66,10 @@ struct xdp_txq_info {
|
||||
|
@ -17,8 +17,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
||||
net/core/xdp.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 69 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/include/net/xdp.h b/include/net/xdp.h
|
||||
index 1f8641ec658e..8463dea8b4db 100644
|
||||
--- a/include/net/xdp.h
|
||||
+++ b/include/net/xdp.h
|
||||
@@ -275,10 +275,24 @@ void __xdp_release_frame(void *data, str
|
||||
|
@ -19,8 +19,6 @@ Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
||||
include/linux/skbuff.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
|
||||
index bf11e1fbd69b..8131d0de7559 100644
|
||||
--- a/include/linux/skbuff.h
|
||||
+++ b/include/linux/skbuff.h
|
||||
@@ -567,6 +567,7 @@ struct skb_shared_info {
|
||||
|
@ -20,8 +20,6 @@ Link: https://lore.kernel.org/bpf/54f9fd3bb65d190daf2c0bbae2f852ff16cfbaa0.16469
|
||||
include/net/xdp.h | 14 ++++++++++++++
|
||||
2 files changed, 16 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
|
||||
index 58b20ea171dd..b77ce3fdcfe8 100644
|
||||
--- a/drivers/net/veth.c
|
||||
+++ b/drivers/net/veth.c
|
||||
@@ -501,7 +501,7 @@ static int veth_xdp_xmit(struct net_devi
|
||||
|
@ -18,8 +18,6 @@ Link: https://lore.kernel.org/bpf/d5dc039c3d4123426e7023a488c449181a7bc57f.16469
|
||||
drivers/net/veth.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
|
||||
index bfae15ec902b..1b5714926d81 100644
|
||||
--- a/drivers/net/veth.c
|
||||
+++ b/drivers/net/veth.c
|
||||
@@ -1470,9 +1470,14 @@ static int veth_xdp_set(struct net_devic
|
||||
|
Loading…
Reference in New Issue
Block a user