diff options
| author | Rui Salvaterra <rsalvaterra@gmail.com> | 2021-10-27 11:10:45 +0100 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-30 21:17:20 +0200 |
| commit | 02026d0a6f2e4b939178219a703158cd7b9d658a (patch) | |
| tree | e276ad24200f7fbef131066f36f4fc4f01318052 /target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch | |
| parent | e6a486fe79174bb256db489363304ce236d012bb (diff) | |
| download | upstream-02026d0a6f2e4b939178219a703158cd7b9d658a.tar.gz upstream-02026d0a6f2e4b939178219a703158cd7b9d658a.tar.bz2 upstream-02026d0a6f2e4b939178219a703158cd7b9d658a.zip | |
kernel: bump 5.10 to 5.10.76
Deleted (upstreamed):
bcm27xx/patches-5.10/950-0145-xhci-add-quirk-for-host-controllers-that-don-t-updat.patch [1]
Manually rebased:
bcm27xx/patches-5.10/950-0355-xhci-quirks-add-link-TRB-quirk-for-VL805.patch
bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch
Note: although automatically rebaseable, the last patch has been edited to avoid
conflicting bit definitions.
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.10.y&id=b6f32897af190d4716412e156ee0abcc16e4f1e5
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch')
| -rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch b/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch index 2c1d935d9e..9abc6e6778 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-14-net-bridge-resolve-forwarding-path-for-VLAN-tag-acti.patch @@ -109,7 +109,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -1095,6 +1095,13 @@ void br_vlan_notify(const struct net_bri +@@ -1093,6 +1093,13 @@ void br_vlan_notify(const struct net_bri bool br_vlan_can_enter_range(const struct net_bridge_vlan *v_curr, const struct net_bridge_vlan *range_end); @@ -123,7 +123,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> static inline struct net_bridge_vlan_group *br_vlan_group( const struct net_bridge *br) { -@@ -1252,6 +1259,19 @@ static inline int nbp_get_num_vlan_infos +@@ -1250,6 +1257,19 @@ static inline int nbp_get_num_vlan_infos { return 0; } |