Skip to content

WIP: 4.19.67 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sdelafond wants to merge 3 commits into
base: master
Choose a base branch
from
Open

WIP: 4.19.67 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a267b04
Put Untangle patches in new-style dedicated directory
sdelafond Jan 10, 2020
83a8171
Do not let the patch-applying command fail, and also prevent fuzz
sdelafond Jan 10, 2020
3bf2403
Manually rebase Untangle 4.9 patches on top of 4.19.
sdelafond Jan 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions debian-4.19.0/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ patch-debian-stamp: extract-stamp patches/debian/*

patch-untangle: patch-untangle-stamp
patch-untangle-stamp: extract-stamp patches/untangle/*
mkdir -p $(KERNEL_DIR)/debian/patches/features/all/untangle
cp patches/untangle/*.patch $(KERNEL_DIR)/debian/patches/features/all/untangle
perl -pe 's|^|features/all/untangle/|' patches/untangle/series > $(KERNEL_DIR)/debian/patches/series-untangle
mkdir -p $(KERNEL_DIR)/debian/patches-untangle
cp patches/untangle/* $(KERNEL_DIR)/debian/patches-untangle
touch $@

version: version-stamp
Expand All @@ -60,10 +59,6 @@ version-stamp: changelog
touch $@

patch: patch-debian patch-untangle version
# FIXME: make this a debian patch ?
perl -i -pe 's/fuzz=0/fuzz=3 || true/' ${KERNEL_DIR}/debian/rules.defs*
perl -i -pe 's/fuzz=0/fuzz=3 || true/' ${KERNEL_DIR}/debian/rules.gen*
perl -i -pe 's/fuzz=0/fuzz=3 || true/' ${KERNEL_DIR}/debian/rules.real*

pkgs: kpkg-arch kpkg-indep

Expand Down
16 changes: 8 additions & 8 deletions ...untangle/0010-bridge-mac-ageing-fix.patch → ...untangle/0001-bridge-mac-ageing-fix.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
From 2caf3631c0366eb56aa8a1fbd0426a100f97781f Mon Sep 17 00:00:00 2001
From 7a5a25527ed65e98473119160ea867163eaf31e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= <[email protected]>
Date: Thu, 18 May 2017 11:16:03 +0200
Subject: [PATCH 01/12] bridge mac ageing fix
Date: Thu, 9 Jan 2020 15:31:46 +0100
Subject: [PATCH 1/9] bridge mac ageing fix

---
net/bridge/br_input.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 9f7a7e9..04c9669 100644
index 2532c1a..401e080 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -270,6 +270,14 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)

p = br_port_get_rcu(skb->dev);
@@ -227,6 +227,14 @@ rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
goto drop;
}

+ if (p->state == BR_STATE_LEARNING ||
+ p->state == BR_STATE_FORWARDING) {
Expand All @@ -27,5 +27,5 @@ index 9f7a7e9..04c9669 100644
u16 fwd_mask = p->br->group_fwd_mask_required;

--
2.8.1
2.23.0

Loading