diff options
| author | Robert Marko <robimarko@gmail.com> | 2023-06-06 11:36:06 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-06-06 20:08:30 +0200 |
| commit | f6485c7ce6de05618248b9ea18e93bc0262f163f (patch) | |
| tree | 0bb311fe89f9644d60247a6618258200bff0a4c0 /target/linux/generic/hack-6.1 | |
| parent | 4747b96287aa3a0f1df5047fc0b2cc1835ff9cc8 (diff) | |
| download | upstream-f6485c7ce6de05618248b9ea18e93bc0262f163f.tar.gz upstream-f6485c7ce6de05618248b9ea18e93bc0262f163f.tar.bz2 upstream-f6485c7ce6de05618248b9ea18e93bc0262f163f.zip | |
kernel: bump 6.1 to 6.1.32
Removed upstreamed:
generic-backport/610-v6.3-net-page_pool-use-in_softirq-instead.patch[1]
All other patches automatically rebased.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/net?h=v6.1.32&id=7dccd5fa7edb9562da61af820bb9d0346447baf1
Build system: x86_64/Fedora 38
Build-tested: ipq807x/Dynalink DL-WRX36
Runtime-tested: ipq807x/Dynalink DL-WRX36
Signed-off-by: Robert Marko <robimarko@gmail.com>
Diffstat (limited to 'target/linux/generic/hack-6.1')
| -rw-r--r-- | target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch index 42ee8c2832c..ff23e781a62 100644 --- a/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch +++ b/target/linux/generic/hack-6.1/721-net-add-packet-mangeling.patch @@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -3022,6 +3022,10 @@ static inline int pskb_trim(struct sk_bu +@@ -3032,6 +3032,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 -@@ -3171,16 +3175,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -3181,16 +3185,6 @@ static inline struct sk_buff *dev_alloc_ } |