Skip to content

Commit 210a95f

Browse files
committed
Improve pppoe check for backports
1 parent c207fa6 commit 210a95f

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

drivers/intel/ice/ice-2.3.10-zc/src/kcompat-generator.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,12 @@ function gen-flow-dissector() {
205205
sgh='include/net/sch_generic.h'
206206
tmh='include/net/tc_act/tc_mirred.h'
207207

208-
gen HAVE_FLOW_DISSECTOR_KEY_PPPOE if enum flow_dissector_key_id matches FLOW_DISSECTOR_KEY_PPPOE in "$fdh" "$fkh"
208+
HAVE_PPPOE=0
209+
if check enum flow_dissector_key_id matches FLOW_DISSECTOR_KEY_PPPOE in "$fdh" "$fkh" &&
210+
check struct flow_match_pppoe in "$foh"; then
211+
HAVE_PPPOE=1
212+
fi
213+
gen HAVE_FLOW_DISSECTOR_KEY_PPPOE if string "$HAVE_PPPOE" equals 1
209214
gen HAVE_FLOW_DISSECTOR_ICMP_ID if enum flow_dissector_key_icmp matches id in "$fdh"
210215

211216
gen HAVE_FLOW_BLOCK_API if fun flow_block_cb_priv in "$foh"

0 commit comments

Comments
 (0)