summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* tc: code cleanupStephen Hemminger2016-03-2170-864/+966
| | | | Use checkpatch to fix whitespace and other style issues.
* tc: q_{codel,fq_codel}: add missing space in help textLuca Lemmo2016-03-212-2/+2
| | | | Signed-off-by: Luca Lemmo <luca@linux.com>
* tc: f_u32: trivial coding style cleanupsLuca Lemmo2016-03-211-4/+4
| | | | Signed-off-by: Luca Lemmo <luca@linux.com>
* tc: f_u32: add missing spaces around operatorsLuca Lemmo2016-03-211-6/+6
| | | | Signed-off-by: Luca Lemmo <luca@linux.com>
* bridge: mdb: add support for extended router port informationNikolay Aleksandrov2016-03-143-10/+52
| | | | | | | | | | | | | | | | | Recently a new temp router port mode was added and with it the dumped information was extended similar to how mdb entries were done. This patch adds support to dump the new information by using the "-s" switch. Example: $ bridge -d -s mdb show dev br0 port eth1 grp ff02::1:ffbf:5716 temp 234.39 dev br0 port eth1 grp 239.0.0.2 temp 97.17 dev br0 port eth1 grp 239.0.0.3 temp 105.36 router ports on br0: eth1 0.00 permanent router ports on br0: eth2 254.87 temp It also updates the bridge man page. Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
* Merge branch 'master' into net-nextStephen Hemminger2016-03-141-1/+1
|\
| * v4.5.0v4.5.0Stephen Hemminger2016-03-141-1/+1
| |
* | Merge branch 'master' into net-nextStephen Hemminger2016-03-065-30/+16
|\|
| * tc: pedit: Fix retain value for ihl adjustmentsPhil Sutter2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | Since the IP Header Length field is just half a byte, adjust retain to only match these bits so the Version field is not overwritten by accident. The whole concept is actually broken due to dependency on endianness which pedit ignores. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * tc: pedit: Fix parse_cmd()Phil Sutter2016-03-061-16/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was horribly broken: * pack_key8() and pack_key16() ... * missed to invert retain value when applying it to the mask, * did not sanitize val by ANDing it with retain, * and ignored the mask which is necessary for 'invert' command. * pack_key16() did not convert mask to network byte order. * Changing the retain value for 'invert' or 'retain' operation seems just plain wrong. * While here, also got rid of unnecessary offset sanitization in pack_key32(). * Simplify code a bit by always assigning the local mask variable to tkey->mask before calling any of the pack_key*() variants. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * tc: pedit: Fix layered op parsingPhil Sutter2016-03-061-0/+1
| | | | | | | | | | | | | | | | | | After lookup of the layered op submodule, pedit would pass argv and argc including the layered op identifier at first position which confused the submodule parser. Fix this by calling NEXT_ARG() before calling the parse_peopt() callback. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * libnetlink: Double the dump buffer sizePhil Sutter2016-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There have been reports about 'ip addr' printing "Message truncated" on systems with large numbers of VFs. Although I haven't been able to get my hands on hardware suitable to reproduce this, increasing the dump buffer has been reported to resolve the issue. For want of a better idea, just double the buffer size to 32k. Feels like this opportunistic buffer size selection is rather workarounding a design flaw in libnetlink or maybe even the netlink protocol itself. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * ifstat, nstat: fix daemon modePhil Sutter2016-03-062-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the relevant code (and it's bugs) is identical in both files, fix them in one go. This patch fixes multiple issues: * Using 'int' for the 'tdiff' variable does not suffice on 64bit systems, the assigned initial time difference makes it wrap and contain a negative value afterwards. Instead use the more appropriate 'time_t' type. * As far as I understood the code, poll() is supposed to time out just at the right time to trigger update_db() in the configured interval. Therefore it's timeout must be set to the desired interval *minus* the time that has already passed since then. * With the last change to the algorithm in place, it does not make sense to call update_db() before returning data to the connected client. Actually, it never does otherwise we could skip the periodic updates in the first place. Signed-off-by: Phil Sutter <phil@nwl.cc>
* | bridge: mdb: add support for offloaded mdb entriesElad Raz2016-03-061-2/+3
| | | | | | | | | | | | | | Mark MDB entries which are offloaded to HW with "offload" flag Signed-off-by: Elad Raz <eladr@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com>
* | Merge branch 'master' into net-nextStephen Hemminger2016-03-0439-162/+1598
|\|
| * doc: Add my article about tc, filters and actionsPhil Sutter2016-03-043-1/+531
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * ipneigh: List all nud states in help outputPhil Sutter2016-03-041-4/+5
| | | | | | | | | | | | | | | | To not make the output overly confusing, list them in a definition of the STATE placeholder which is already used in the show/flush syntax but wasn't explained before. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-neighbour.8: Document all known nud statesPhil Sutter2016-03-041-1/+21
| | | | | | | | | | | | | | | | | | | | Not sure how useful they are in practice, but as 'ip neigh' supports setting them all, they deserve to be described as well. While at it, also add a missing layer of indentation to the subordinate nud state list. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * doc, man: ip-rule: Remove incorrect statement about rule 0Phil Sutter2016-03-042-5/+0
| | | | | | | | | | | | | | The documentation is wrong here: it is indeed possible to remove policy rule 0 and recreate it afterwards. Therefore remove these statements. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-route: Make synopsis consistent with descriptionPhil Sutter2016-03-041-1/+1
| | | | | | | | | | | | | | | | While the synopsis section contains 'ip route list', it is later described as 'ip route show'. Make this consistent by replacing 'list' with 'show' in synopsis. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * tc: pedit: document branch control in help outputPhil Sutter2016-03-041-1/+2
| | | | | | | | | | | | | | This seems to have been a hidden feature, though it's very useful and necessary at least when combining multiple pedit actions. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-link: Beef up VXLAN csum options a bitPhil Sutter2016-03-041-3/+3
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: tc-u32: Minor syntax fixPhil Sutter2016-03-041-0/+1
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ship action man pagesPhil Sutter2016-03-041-1/+3
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the xt actionPhil Sutter2016-03-041-0/+42
| | | | | | | | | | Cc: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the vlan actionPhil Sutter2016-03-041-0/+54
| | | | | | | | | | Cc: Jiri Pirko <jiri@resnulli.us> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the skbedit actionPhil Sutter2016-03-041-0/+45
| | | | | | | | | | Cc: Alexander Duyck <alexander.duyck@gmail.com> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the simple actionPhil Sutter2016-03-041-0/+76
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the police actionPhil Sutter2016-03-041-0/+127
| | | | | | | | | | Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the pedit actionPhil Sutter2016-03-041-0/+230
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the nat actionPhil Sutter2016-03-041-0/+78
| | | | | | | | | | Cc: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the mirred actionPhil Sutter2016-03-041-0/+89
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the csum action.Phil Sutter2016-03-041-0/+54
| | | | | | | | | | Cc: Gregoire Baron <baronchon@n7mm.org> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: Add a man page for the connmark actionPhil Sutter2016-03-041-0/+55
| | | | | | | | | | Cc: Felix Fietkau <nbd@openwrt.org> Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-*.8: drop any reference to generic ip optionsPhil Sutter2016-03-024-31/+4
| | | | | | | | | | | | | | | | | | Listing generic 'ip' options in subcommand man pages is redundant and error-prone, as they won't be kept in sync anyway. Since many other man pages don't list them either, drop references to them in the remaining ones. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-l2tp.8: Fix BNF syntaxPhil Sutter2016-03-021-15/+9
| | | | | | | | | | | | | | | | The 'ADDR' part of 'local' and 'remote' parameters is not optional, but may also consist of the word 'any'. While at it, add missing whitespace and fix fonts. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip.8: Add missing flags and token subcommand descriptionPhil Sutter2016-03-021-1/+28
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-xfrm.8: Document missing parametersPhil Sutter2016-03-021-0/+11
| | | | | | | | | | | | Namely, 'extra-flag' of 'ip xfrm state' and 'flag' of 'ip xfrm policy'. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-tunnel.8: Document missing 6rd actionPhil Sutter2016-03-021-4/+7
| | | | | | | | | | | | | | Also drop the non-terminal 'TIME' description as it is not referenced anywhere. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-token.8: Review synopsis sectionPhil Sutter2016-03-021-6/+6
| | | | | | | | | | | | | | | | Drop unnecessary curly braces around single action keywords, point out that 'dev' parameter to 'ip token get' is optional and clarify that 'ip token' defaults to 'list' action. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-rule.8: Review synopsis sectionPhil Sutter2016-03-021-6/+13
| | | | | | | | | | | | | | | | | | Clarify that 'ip rule' defaults to action 'list', that 'flush' and 'save' actions don't accept additional parameters, add missing 'not' and 'goto' keywords and finally fix fonts used in 'fwmark' and 'realms' parameters. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-ntable.8: Review synopsis sectionPhil Sutter2016-03-021-17/+22
| | | | | | | | | | | | | | | | | | The first line contained a c'n'p error, incorrectly listing 'ip address' syntax. Since PARAMS is used just once and there are not many other parameters to 'ip ntable change', state them inline and in addition to that clarify the possibility to pass multiple parameters at once. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-netns.8: Clarify synopsis a bitPhil Sutter2016-03-021-2/+2
| | | | | | | | | | | | | | Use brackets to show that 'ip netns' defaults to action 'list', drop superfluous curly braces around 'set' action keyword. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-neighbour: Fix for missing NUD_STATE descriptionPhil Sutter2016-03-021-3/+8
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-link.8: Fix and improve synopsisPhil Sutter2016-03-021-45/+55
| | | | | | | | | | | | | | | | Reflect that it is possible to pass multiple parameters at the same time, also use the same trick the help text uses to emphasize vf specific parameters. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-link.8: minor font fixPhil Sutter2016-03-021-1/+1
| | | | | | | | | | | | We commonly use bold font for terminals and italic for non-terminals. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * man: ip-address.8: Minor syntax fixesPhil Sutter2016-03-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | Clarify that the optional '-' prefix of the 'tentative', 'deprecated' and 'dadfailed' keywords has to be put right in front of them, no whitespace is allowed in between. In addition to that, clarify that it is valid to pass both 'valid_lft' and 'preferred_lft' at the same time to 'ip address'. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * iprule: add missing nat keyword to help textPhil Sutter2016-03-021-0/+1
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
| * iproute: TYPE keyword is not optional, fix help text accordinglyPhil Sutter2016-03-021-3/+3
| | | | | | | | | | | | | | | | | | | | This is a bit pedantic, but brackets ([]) show optional values and since TYPE must not become empty, they're not suited to surround the type keyword choices. Use curly braces instead. Also add some missing whitespace to the parameter list above. Signed-off-by: Phil Sutter <phil@nwl.cc>
| * ipntable: Fix typo in help textPhil Sutter2016-03-021-1/+1
| | | | | | | | Signed-off-by: Phil Sutter <phil@nwl.cc>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-11 09:05:07 +0000