From 1bd2ecc17d74b6a8ffba97806cf90ef706d7411b Mon Sep 17 00:00:00 2001 From: Oliver Kiddle Date: Sat, 31 Mar 2018 10:12:59 +0200 Subject: 42572: various completion option updates --- Completion/Linux/Command/_ethtool | 20 ++++++++++++++++++-- Completion/Linux/Command/_ss | 7 ++++--- 2 files changed, 22 insertions(+), 5 deletions(-) (limited to 'Completion/Linux') diff --git a/Completion/Linux/Command/_ethtool b/Completion/Linux/Command/_ethtool index 7c62fd7f7..52b8f0451 100644 --- a/Completion/Linux/Command/_ethtool +++ b/Completion/Linux/Command/_ethtool @@ -45,7 +45,10 @@ _arguments -C \ '--show-eee[show EEE settings]' \ '--set-eee[set EEE settings]' \ '--set-phy-tunable[set PHY tunable]' \ - '--get-phy-tunable[get PHY tunable]' && return + '--get-phy-tunable[get PHY tunable]' \ + '--reset[reset hardware components]' \ + '--show-fec[query device for forward error correction support]' \ + '--set-fec[configure forward error correction for device]' && return if [[ -n $state ]]; then case $words[CURRENT-1] in @@ -132,6 +135,12 @@ if [[ -n $state ]]; then hfunc) _message -e functions expl 'hash function' ;; + flags) + _message -e masks expl mask + ;; + encoding) + _wanted encodings expl encoding compadd auto off rs baser + ;; *) case $words[2] in -A|--pause) @@ -143,7 +152,7 @@ if [[ -n $state ]]; then -C|--coalesce) _wanted settings expl 'coalescing setting' compadd -F line -M 'r:|-=* r:|=*' - \ adaptive-{r,t}x {r,t}x-{usecs,frames}{,-irq,-high,-low} \ - stats-block-usecs pkt-rate-{low,high} sample-interval dmac + stats-block-usecs pkt-rate-{low,high} sample-interval ;; -G|--set-ring) _values -S ' ' -w 'ring parameter' \ @@ -268,6 +277,13 @@ if [[ -n $state ]]; then --get-phy-tunable) _wanted options expl tunable compadd downshift ;; + --reset) + _wanted components expl component compadd flags dedicated all \ + {mgmt,irq,dma,filter,offload,mac,phy,ram,ap}{,-shared} + ;; + --set-fec) + _wanted options expl tunable compadd -F line - encoding + ;; esac ;; esac diff --git a/Completion/Linux/Command/_ss b/Completion/Linux/Command/_ss index e5289b0a7..afe00b6a3 100644 --- a/Completion/Linux/Command/_ss +++ b/Completion/Linux/Command/_ss @@ -33,10 +33,11 @@ _arguments -C -s \ "($info -d --dccp)"{-d,--dccp}'[display DCCP sockets]' \ "($info -w --raw)"{-w,--raw}'[display RAW sockets]' \ "($info -x --unix)"{-x,--unix}'[display Unix domain sockets]' \ - "($info -f --family)"{-f,--family}'[display sockets of specified type]:family:(unix inet inet6 link netlink unix)' \ + "($info)--vsock[display only vsock sockets]' \ + "($info -f --family)"{-f,--family}'[display sockets of specified type]:family:(unix inet inet6 link netlink unix vsock)' \ "($info -K --kill)"{-K,--kill}'[forcibly close sockets, display what was closed]' \ "($info -H --no-header)"{-H,--no-header}'[suppress header line]' \ - "($info -A --query --socket)"{-A,--query,--socket}'[specify socket tables to show]: :_values -s , socket\ table all inet tcp udp raw unix packet netlink unix_dgram unix_stream unix_seqpacket packet_raw packet_dgram' \ + "($info -A --query --socket)"{-A,--query,--socket}'[specify socket tables to show]: :_values -s , socket\ table all inet tcp udp raw unix packet netlink unix_dgram unix_stream unix_seqpacket packet_raw packet_dgram vsock_stream vsock_dgram' \ "($info -D)"{-D,--diag=}'[dump raw info to file]:file:_files' \ "($info -F)"{-F,--filter=}'[read filter information from a file]:file:_files' \ "($info)*: :->filter" && ret=0 @@ -78,7 +79,7 @@ if [[ -n $state ]]; then state|exclude) _wanted states expl state compadd -M 'm:{a-zA-Z_}={A-Za-z-}' \ ESTABLISHED SYN-SENT SYN-RECV FIN-WAIT-1 FIN-WAIT-2 TIME-WAIT \ - CLOSED CLOSE-WAIT LAST-ACK LISTEN CLOSING \ + CLOSED CLOSE-WAIT LAST-ACK LISTENING CLOSING \ all connected synchronized bucket big && ret=0 ;; *) -- cgit 1.4.1