osmith has submitted this change. (
https://gerrit.osmocom.org/c/dahdi-linux/+/42904?usp=email )
Change subject: drivers/dahdi/dahdi-base: fix linux 7.1 compat
......................................................................
drivers/dahdi/dahdi-base: fix linux 7.1 compat
Adjust to the "code" argument of ppp_input_error() not existing anymore
since abb0eb0b ("ppp: simplify input error handling").
Related:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=abb0eb0b033a0a8980eb9215e02626e4801ead3f
Change-Id: Ia17190e4bd8bcc480cbe98b55f930149e554a576
---
M drivers/dahdi/dahdi-base.c
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, but someone else must approve
daniel: Looks good to me, but someone else must approve
osmith: Looks good to me, approved; Verified
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c
index a0238e6..657eb34 100644
--- a/drivers/dahdi/dahdi-base.c
+++ b/drivers/dahdi/dahdi-base.c
@@ -6394,7 +6394,11 @@
ppp_input(chan->ppp, skb);
if (chan->do_ppp_error) {
chan->do_ppp_error = 0;
+#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 1, 0)
ppp_input_error(chan->ppp, 0);
+#else
+ ppp_input_error(chan->ppp);
+#endif
}
}
#endif
--
To view, visit https://gerrit.osmocom.org/c/dahdi-linux/+/42904?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: dahdi-linux
Gerrit-Branch: master
Gerrit-Change-Id: Ia17190e4bd8bcc480cbe98b55f930149e554a576
Gerrit-Change-Number: 42904
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <[email protected]>
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
