From: Jakub Kicinski Date: Thu, 12 Mar 2026 02:04:58 +0000 (-0700) Subject: Merge branch 'neighbour-fix-update-of-proxy-neighbour' X-Git-Tag: v7.0-rc4~37^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e62a22f43475624ea466fd9b766f62e8458f4cd9;p=thirdparty%2Flinux.git Merge branch 'neighbour-fix-update-of-proxy-neighbour' Sabrina Dubroca says: ==================== neighbour: fix update of proxy neighbour While re-reading some "old" patches I ran into a small change of behavior in commit dc2a27e524ac ("neighbour: Update pneigh_entry in pneigh_create()."). The old behavior was not consistent between ->protocol and ->flags, and didn't offer a way to clear protocol, so maybe it's better to change that (7-years-old [1]) behavior. But then we should change non-proxy neighbours as well to keep neigh/pneigh consistent. [1] df9b0e30d44c ("neighbor: Add protocol attribute") ==================== Link: https://patch.msgid.link/cover.1772894876.git.sd@queasysnail.net Signed-off-by: Jakub Kicinski --- e62a22f43475624ea466fd9b766f62e8458f4cd9