Nanako/immortalwrt-mt798x-24.10
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/source/2410' into 2410

Browse Source
This commit is contained in:
Nanako
2025-04-28 00:59:10 +08:00
parent bcd4c04be8 14fae94204
commit c8fe53aac1
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
target/linux/mediatek/files-5.4/drivers/net/ethernet/mediatek/mtk_hnat/hnat_nf_hook.c
View File

@@ -757,12 +757,6 @@ static inline void hnat_set_alg(const struct nf_hook_state *state,
skb_hnat_alg(skb) = val;
}
static inline void hnat_set_tag(const struct nf_hook_state *state,
struct sk_buff *skb, int val)
{
skb_hnat_magic_tag(skb) = val;
}
static inline void hnat_set_head_frags(const struct nf_hook_state *state,
struct sk_buff *head_skb, int val,
void (*fn)(const struct nf_hook_state *state,
@@ -1039,8 +1033,9 @@ mtk_hnat_ipv6_nf_pre_routing(void *priv, struct sk_buff *skb,
goto drop;
if (!IS_WHNAT(state->in) && IS_EXT(state->in) && IS_SPACE_AVAILABLE_HEAD(skb)) {
hnat_set_head_frags(state, skb, 0, hnat_set_alg);
hnat_set_head_frags(state, skb, HNAT_MAGIC_TAG, hnat_set_tag);
skb_hnat_alg(skb) = 0;
skb_hnat_filled(skb) = 0;
skb_hnat_magic_tag(skb) = HNAT_MAGIC_TAG;
}
if (!is_magic_tag_valid(skb))
@@ -1114,8 +1109,9 @@ mtk_hnat_ipv4_nf_pre_routing(void *priv, struct sk_buff *skb,
if (!IS_WHNAT(state->in) && IS_EXT(state->in) && IS_SPACE_AVAILABLE_HEAD(skb)) {
hnat_set_head_frags(state, skb, 0, hnat_set_alg);
hnat_set_head_frags(state, skb, HNAT_MAGIC_TAG, hnat_set_tag);
skb_hnat_alg(skb) = 0;
skb_hnat_filled(skb) = 0;
skb_hnat_magic_tag(skb) = HNAT_MAGIC_TAG;
}
if (!is_magic_tag_valid(skb))
@@ -1177,8 +1173,9 @@ mtk_hnat_br_nf_local_in(void *priv, struct sk_buff *skb,
goto drop;
if (!IS_WHNAT(state->in) && IS_EXT(state->in) && IS_SPACE_AVAILABLE_HEAD(skb)) {
hnat_set_head_frags(state, skb, 0, hnat_set_alg);
hnat_set_head_frags(state, skb, HNAT_MAGIC_TAG, hnat_set_tag);
skb_hnat_alg(skb) = 0;
skb_hnat_filled(skb) = 0;
skb_hnat_magic_tag(skb) = HNAT_MAGIC_TAG;
}
if (!is_magic_tag_valid(skb))