diff options
| author | David Ahern <dsahern@kernel.org> | 2022-03-04 09:24:25 -0700 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2022-03-04 09:24:25 -0700 |
| commit | 07cebdd00d5857a3c79e36e513a957ae1e88f4d6 (patch) | |
| tree | 03a3eef8d30881a6f1b020d579afdd54f1f86b2e | |
| parent | 0a9f3008e108df0903567fb64129d6b717fa2f91 (diff) | |
| parent | 712ec66e6f3ea4e1f9b69c70becd060d1c899976 (diff) | |
| download | iproute2-07cebdd00d5857a3c79e36e513a957ae1e88f4d6.tar.gz | |
Merge branch 'link-layer-protocols' into next
Daniel Braunwarth says:
====================
Update the llproto_names array to allow users to reference the PROFINET
and EtherCAT protocols with the names 'profinet' and 'ethercat'.
These patches depends on the below referenced patch, which extends if_ether.h
with the used ETH_P_xxx defines.
Link: https://lore.kernel.org/netdev/20220228133029.100913-1-daniel@braunwarth.dev/
====================
Signed-off-by: David Ahern <dsahern@kernel.org>
| -rw-r--r-- | bash-completion/tc | 8 | ||||
| -rw-r--r-- | lib/ll_proto.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bash-completion/tc b/bash-completion/tc index 086cb7f67..9f16d0d48 100644 --- a/bash-completion/tc +++ b/bash-completion/tc @@ -127,10 +127,10 @@ _tc_direct_complete() protocol) # list comes from lib/ll_proto.c COMPREPLY+=( $( compgen -W ' 802.1Q 802.1ad 802_2 802_3 LLDP aarp \ all aoe arp atalk atmfate atmmpoa ax25 bpq can control cust \ - ddcmp dec diag dna_dl dna_rc dna_rt econet ieeepup ieeepupat \ - ip ipv4 ipv6 ipx irda lat localtalk loop mobitex ppp_disc \ - ppp_mp ppp_ses ppptalk pup pupat rarp sca snap tipc tr_802_2 \ - wan_ppp x25' -- "$cur" ) ) + ddcmp dec diag dna_dl dna_rc dna_rt econet ethercat ieeepup \ + ieeepupat ip ipv4 ipv6 ipx irda lat localtalk loop mobitex \ + ppp_disc ppp_mp ppp_ses ppptalk profinet pup pupat rarp sca \ + snap tipc tr_802_2 wan_ppp x25' -- "$cur" ) ) return 0 ;; prio) diff --git a/lib/ll_proto.c b/lib/ll_proto.c index 78179311c..342ea2eef 100644 --- a/lib/ll_proto.c +++ b/lib/ll_proto.c @@ -75,7 +75,9 @@ __PF(CONTROL,control) __PF(IRDA,irda) __PF(ECONET,econet) __PF(TIPC,tipc) +__PF(PROFINET,profinet) __PF(AOE,aoe) +__PF(ETHERCAT,ethercat) __PF(8021Q,802.1Q) __PF(8021AD,802.1ad) __PF(MPLS_UC,mpls_uc) |