Commit 512436b

committed

ON-16634: Update ef_vi X4 naming

1 parent 2579c4b commit 512436bCopy full SHA for 512436b

File tree

+12

-12

lines changed

+12

-12

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,8 @@ enum ef_pd_flags {`
`44`	`44`	`/** Bypass the /proc/driver/sfc_resource/.../enable blacklist feature.`
`45`	`45`	`* Required CAP_NET_ADMIN */`
`46`	`46`	`EF_PD_IGNORE_BLACKLIST = 0x40,`
`47`		`- /** Protection domain supports low latency cut through interface */`
`48`		`- EF_PD_LLCT = 0x80,`
	`47`	`+ /** Protection domain supports express datapath interface */`
	`48`	`+ EF_PD_EXPRESS = 0x80,`
`49`	`49`	`};`
`50`	`50`
`51`	`51`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ int ef_vi_capabilities_get_from_pd_flags(ef_driver_handle handle,`
`119`	`119`	`{`
`120`	`120`	`pd_flags = ef_pd_flags_from_env(pd_flags, handle, ifindex);`
`121`	`121`
`122`		`- if( pd_flags & EF_PD_LLCT )`
	`122`	`+ if( pd_flags & EF_PD_EXPRESS )`
`123`	`123`	`cap \|= EF_VI_CAP_F_LLCT;`
`124`	`124`
`125`	`125`	`return __ef_vi_capabilities_get(handle, ifindex, -1, -1, cap, value);`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,8 @@ static enum ef_pd_flags __ef_pd_flags_from_env(enum ef_pd_flags flags)`
`47`	`47`	`flags = 0;`
`48`	`48`	`else if( __ef_tok_eq(s, tok_end - s, "mcast_loop") )`
`49`	`49`	`new_flags \|= EF_PD_MCAST_LOOP;`
`50`		`- else if( __ef_tok_eq(s, tok_end - s, "llct") )`
`51`		`- new_flags \|= EF_PD_LLCT;`
	`50`	`+ else if( __ef_tok_eq(s, tok_end - s, "express") )`
	`51`	`+ new_flags \|= EF_PD_EXPRESS;`
`52`	`52`	`s = tok_end + 1;`
`53`	`53`	`} while( *tok_end != '0円' );`
`54`	`54`
`@@ -68,7 +68,7 @@ static enum ef_pd_flags ef_pd_extra_flags_for_compat(ef_driver_handle pd_dh,`
`68`	`68`	`EF_VI_CAP_EXTRA_DATAPATHS,`
`69`	`69`	`&capability_val);`
`70`	`70`	`if( rc == 0 && (capability_val & EF_VI_EXTRA_DATAPATH_EXPRESS) )`
`71`		`- return EF_PD_LLCT;`
	`71`	`+ return EF_PD_EXPRESS;`
`72`	`72`	`}`
`73`	`73`	`return 0;`
`74`	`74`	`}`
`@@ -114,7 +114,7 @@ static int __ef_pd_alloc(ef_pd* pd, ef_driver_handle pd_dh,`
`114`	`114`	`ra.u.pd.in_flags \|= EFCH_PD_FLAG_RX_PACKED_STREAM;`
`115`	`115`	`if( flags & EF_PD_IGNORE_BLACKLIST )`
`116`	`116`	`ra.u.pd.in_flags \|= EFCH_PD_FLAG_IGNORE_BLACKLIST;`
`117`		`- if( flags & EF_PD_LLCT )`
	`117`	`+ if( flags & EF_PD_EXPRESS )`
`118`	`118`	`ra.u.pd.in_flags \|= EFCH_PD_FLAG_LLCT;`
`119`	`119`	`ra.u.pd.in_vlan_id = vlan_id;`
`120`	`120`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ enum mode {`
`109`	`109`	`};`
`110`	`110`	`static unsigned cfg_mode = MODE_DEFAULT;`
`111`	`111`	`static enum ef_vi_flags cfg_vi_flags = 0;`
`112`		`-static enum ef_pd_flags cfg_rx_pd_flags = EF_PD_LLCT;`
`113`		`-static enum ef_pd_flags cfg_tx_pd_flags = EF_PD_LLCT;`
	`112`	`+static enum ef_pd_flags cfg_rx_pd_flags = EF_PD_EXPRESS;`
	`113`	`+static enum ef_pd_flags cfg_tx_pd_flags = EF_PD_EXPRESS;`
`114`	`114`
`115`	`115`
`116`	`116`	`#define N_RX_BUFS (1 << 8)`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -668,10 +668,10 @@ int parse_interface_with_flags(const char* s, int* ifindex_out,`
`668`	`668`	`for( ; flags; flags = strchr(flags, ',') ) {`
`669`	`669`	`flags++;`
`670`	`670`	`if( flag_token_eq(FLAG_DP_LLCT, flags, strlen(FLAG_DP_LLCT)) ) {`
`671`		`- *pd_flags_out \|= EF_PD_LLCT;`
	`671`	`+ *pd_flags_out \|= EF_PD_EXPRESS;`
`672`	`672`	`requested_llct = true;`
`673`	`673`	`} else if( flag_token_eq(FLAG_DP_FF, flags, strlen(FLAG_DP_FF)) ) {`
`674`		`- *pd_flags_out &= ~EF_PD_LLCT;`
	`674`	`+ *pd_flags_out &= ~EF_PD_EXPRESS;`
`675`	`675`	`requested_llct = false;`
`676`	`676`	`} else if( flag_token_eq(FLAG_PHYS_MODE, flags, strlen(FLAG_PHYS_MODE)) ) {`
`677`	`677`	`*pd_flags_out \|= EF_PD_PHYS_MODE;`
`@@ -685,7 +685,7 @@ int parse_interface_with_flags(const char* s, int* ifindex_out,`
`685`	`685`	`rc = ef_vi_capabilities_get(driver_handle, *ifindex_out,`
`686`	`686`	`EF_VI_CAP_EXTRA_DATAPATHS, &cap);`
`687`	`687`	`if( rc != 0 \|\| ! ( cap & EF_VI_EXTRA_DATAPATH_EXPRESS ) ) {`
`688`		`- *pd_flags_out &= ~EF_PD_LLCT;`
	`688`	`+ *pd_flags_out &= ~EF_PD_EXPRESS;`
`689`	`689`	`if( requested_llct )`
`690`	`690`	`fprintf(stderr,`
`691`	`691`	`"WARNING: interface %s is not multi-arch, ignoring llct flag\n",`

Comments

(0)