mirror_iproute2/ip
David Ahern e9625d6aea Merge branch 'iproute2-master' into iproute2-next
Conflicts:
	bridge/mdb.c

Updated bridge/bridge.c per removal of check_if_color_enabled by commit
1ca4341d2c ("color: disable color when json output is requested")

Signed-off-by: David Ahern <dsahern@gmail.com>
2018-03-13 17:48:10 -07:00
..
.gitignore Another .gitignore file. 2006-08-08 12:11:23 -07:00
ifcfg ifcfg/rtpr: convert to POSIX shell 2018-01-10 08:26:09 -08:00
ila_common.h SPDX license identifiers 2017-11-24 12:21:35 -08:00
ip6tunnel.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
ip_common.h iplink: Perform most of request buffer setups and checks in iplink_parse() 2018-03-11 17:59:03 -07:00
ip.c Merge branch 'iproute2-master' into iproute2-next 2018-03-13 17:48:10 -07:00
ipaddress.c Merge branch 'iproute2-master' into iproute2-next 2018-03-13 17:48:10 -07:00
ipaddrlabel.c ipaddrlabel: add json support 2018-03-06 15:38:41 -08:00
ipfou.c fou: support JSON output 2018-03-06 15:39:34 -08:00
ipila.c ila: fix formatting of help message 2017-11-24 09:21:43 -08:00
ipl2tp.c ipl2tp: Use get_addr_rta() 2018-01-25 09:31:25 -08:00
iplink_bond_slave.c ip: iplink_bond_slave.c: add json output support (info_slave_data) 2017-08-17 18:02:40 -07:00
iplink_bond.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
iplink_bridge_slave.c ip: Use print_0xhex() where appropriate 2018-02-09 08:05:30 -08:00
iplink_bridge.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
iplink_can.c Merge branch 'master' into net-next 2017-08-21 17:37:15 -07:00
iplink_dummy.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_geneve.c utils: Introduce and use inet_prefix_reset() 2018-02-14 09:00:26 -08:00
iplink_hsr.c ip: iplink_hsr.c: add json output support 2017-08-17 18:02:40 -07:00
iplink_ifb.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_ipoib.c ip: iplink_ipoib.c: add json output support 2017-08-17 18:02:41 -07:00
iplink_ipvlan.c ip/ipvlan: enhance ability to add mode flags to existing modes 2017-11-01 22:17:01 +01:00
iplink_macvlan.c ip: link_macvlan.c: add json output support 2017-08-17 18:02:41 -07:00
iplink_netdevsim.c ip: link: add support for netdevsim device type 2018-01-02 20:46:19 -08:00
iplink_nlmon.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_team.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_vcan.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
iplink_vlan.c treewide: Use addattr_nest()/addattr_nest_end() to handle nested attributes 2018-02-02 15:01:09 -08:00
iplink_vrf.c lib/libnetlink: update rtnl_talk to support malloc buff at run time 2017-10-26 12:29:29 +02:00
iplink_vxcan.c iplink: Perform most of request buffer setups and checks in iplink_parse() 2018-03-11 17:59:03 -07:00
iplink_vxlan.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
iplink_xdp.c ip: Consolidate ip, xdp and lwtunnel parse/dump prototypes in ip_common.h 2018-02-02 14:55:12 -08:00
iplink_xstats.c add missing iplink_xstats.c 2017-02-20 08:53:40 -08:00
iplink.c Merge branch 'iproute2-master' into iproute2-next 2018-03-13 17:48:10 -07:00
ipmacsec.c macsec: support JSON 2018-03-07 08:41:43 -08:00
ipmaddr.c ipmaddr: json and color support 2018-03-11 18:52:06 -07:00
ipmonitor.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
ipmroute.c ipmroute: better error message if no kernel mroute 2018-03-11 18:52:34 -07:00
ipneigh.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
ipnetconf.c ipnetconf: add JSON support 2018-03-06 15:38:57 -08:00
ipnetns.c netns: add JSON support 2018-03-08 09:53:11 -08:00
ipntable.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
ipprefix.c netlink route attribute cleanup 2017-02-24 08:56:38 -08:00
iproute_lwtunnel.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
iproute.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
iprule.c iprule: support for ip_proto, sport and dport match options 2018-03-08 10:08:18 -08:00
ipseg6.c ipsr: add json support 2018-03-06 15:39:14 -08:00
iptoken.c token: support JSON 2018-03-06 15:39:19 -08:00
iptunnel.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
iptuntap.c tuntap: support JSON output 2018-03-06 15:39:25 -08:00
ipvrf.c Convert harmful calls to strncpy() to strlcpy() 2017-09-01 12:10:54 -07:00
ipxfrm.c ipxfrm: Replace STRBUF_CAT macro with strlcat() 2017-09-01 12:10:54 -07:00
link_gre6.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
link_gre.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
link_ip6tnl.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
link_iptnl.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
link_veth.c iplink: Perform most of request buffer setups and checks in iplink_parse() 2018-03-11 17:59:03 -07:00
link_vti6.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
link_vti.c utils: Introduce and use nodev() helper routine 2018-03-11 17:58:36 -07:00
Makefile ip: link: add support for netdevsim device type 2018-01-02 20:46:19 -08:00
routef mark shell scripts +x 2018-01-10 08:23:49 -08:00
routel mark shell scripts +x 2018-01-10 08:23:49 -08:00
rtm_map.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
rtmon.c drop unneeded include of syslog.h 2017-11-12 16:22:36 -08:00
rtpr ifcfg/rtpr: convert to POSIX shell 2018-01-10 08:26:09 -08:00
static-syms.c SPDX license identifiers 2017-11-24 12:21:35 -08:00
tcp_metrics.c tcp_metrics: add json support 2018-03-06 15:39:07 -08:00
tunnel.c iptunnel/ip6tunnel: Use netlink to walk through tunnels list 2018-02-07 16:15:42 -08:00
tunnel.h iptunnel/ip6tunnel: Use netlink to walk through tunnels list 2018-02-07 16:15:42 -08:00
xfrm_monitor.c netlink route attribute cleanup 2017-02-24 08:56:38 -08:00
xfrm_policy.c Merge branch 'master' into net-next 2017-11-09 09:45:17 +09:00
xfrm_state.c Merge branch 'master' into net-next 2017-11-09 09:45:17 +09:00
xfrm.h ip: Fix compilation break on old systems 2017-11-13 10:07:25 -08:00