Skip to content

Instantly share code, notes, and snippets.

@graysky2
Created February 10, 2021 16:15
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save graysky2/1e60383c473a7cb960bf15cc143df79b to your computer and use it in GitHub Desktop.
Save graysky2/1e60383c473a7cb960bf15cc143df79b to your computer and use it in GitHub Desktop.
From 97c7275ec009dcf59c57b3b48df42557d1764853 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Wed, 10 Feb 2021 11:10:22 -0500
Subject: [PATCH] nss: fix for 5.4.97 kernel bump
---
.../ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch
index d4425bd408c..9b9837abbc8 100644
--- a/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch
+++ b/target/linux/ipq806x/patches-5.4/999-03a-qca-nss-ecm-support.patch
@@ -1191,15 +1191,15 @@
trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid);
-@@ -1242,6 +1257,8 @@ static int __neigh_update(struct neighbo
+@@ -1259,6 +1259,8 @@ static int __neigh_update(struct neighbo
old = neigh->nud_state;
err = -EPERM;
+ memset(&nmu, 0, sizeof(struct neigh_mac_update)); /* QCA NSS ECM support */
+
- if (!(flags & NEIGH_UPDATE_F_ADMIN) &&
- (old & (NUD_NOARP | NUD_PERMANENT)))
- goto out;
+ if (neigh->dead) {
+ NL_SET_ERR_MSG(extack, "Neighbor entry is now dead");
+ new = old;
@@ -1277,6 +1294,11 @@ static int __neigh_update(struct neighbo
- compare new & old
- if they are different, check override flag
--
2.30.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment