Simon Horman 0d227a8672 mpls: allow routes on ipgre devices ... This appears to be necessary and sufficient to provide MPLS in GRE (RFC4023) support. This can be used by establishing an ipgre tunnel device and then routing MPLS over it. The following example will forward MPLS frames received with an outermost MPLS label 100 over tun1, a GRE tunnel. The forwarded packet will have the outermost MPLS LSE removed and two new LSEs added with labels 200 (outermost) and 300 (next). ip link add name tun1 type gre remote 10.0.99.193 local 10.0.99.192 ttl 225 ip link set up dev tun1 ip addr add 10.0.98.192/24 dev tun1 ip route sh echo 1 > /proc/sys/net/mpls/conf/eth0/input echo 101 > /proc/sys/net/mpls/platform_labels ip -f mpls route add 100 as 200/300 via inet 10.0.98.193 ip -f mpls route sh Also remove unnecessary braces. Reviewed-by: Dinan Gunawardena <dinan.gunawardena@netronome.com> Signed-off-by: Simon Horman <simon.horman@netronome.com> Acked-by: Robert Shearman <rshearma@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2016-06-16 17:12:07 -07:00
..
6lowpan	6lowpan: add support for 802.15.4 short addr handling	2016-06-15 20:41:24 -07:00
9p	remove lots of IS_ERR_VALUE abuses	2016-05-27 15:26:11 -07:00
802	…
8021q	vlan: Propagate MAC address to VLANs	2016-05-31 11:56:48 -07:00
appletalk	appletalk: fix erroneous return value	2016-02-18 14:59:34 -05:00
atm	net/atm: sk_err_soft must be positive	2016-05-23 13:51:10 -07:00
ax25	ax25: add link layer header validation function	2016-03-09 22:13:01 -05:00
batman-adv	sched: remove NET_XMIT_POLICED	2016-06-12 22:02:11 -04:00
bluetooth	net: add netdev_lockdep_set_classes() helper	2016-06-09 13:28:37 -07:00
bridge	bridge: Don't insert unnecessary local fdb entry on changing mac address	2016-06-08 00:31:38 -07:00
caif	net: caif: fix misleading indentation	2016-03-14 13:09:50 -04:00
can	sock: enable timestamping using control messages	2016-04-04 15:50:30 -04:00
ceph	libceph: use %s instead of %pE in dout()s	2016-05-30 23:00:23 +02:00
core	net_sched: add the ability to defer skb freeing	2016-06-15 14:08:34 -07:00
dcb	net/dcb: make dcbnl.c explicitly non-modular	2015-10-09 07:52:27 -07:00
dccp	dccp: do not assume DCCP code is non preemptible	2016-05-02 17:02:25 -04:00
decnet	decnet: Do not build routes to devices without decnet private data.	2016-04-10 23:01:30 -04:00
dns_resolver	KEYS: Add a facility to restrict new links into a keyring	2016-04-11 22:37:37 +01:00
dsa	net: dsa: Initialize CPU port ethtool ops per tree	2016-06-08 11:23:42 -07:00
ethernet	eth: Pull header from first fragment via eth_get_headlen	2016-02-24 13:58:05 -05:00
hsr	net/hsr: Use setup_timer and mod_timer.	2016-05-16 14:00:43 -04:00
ieee802154	6lowpan: add support for 802.15.4 short addr handling	2016-06-15 20:41:24 -07:00
ipv4	net: ipv4: Add ability to have GRE ignore DF bit in IPv4 payloads	2016-06-15 21:39:59 -07:00
ipv6	ila: Fix checksum neutral mapping	2016-06-15 21:40:00 -07:00
ipx	…
irda	TTY and Serial driver update for 4.7-rc1	2016-05-20 20:57:27 -07:00
iucv	af_iucv: use paged SKBs for big inbound messages	2016-06-15 12:21:05 -07:00
kcm	kcm: fix a signedness in kcm_splice_read()	2016-05-19 11:26:51 -07:00
key	af_key: fix two typos	2015-10-23 03:05:19 -07:00
l2tp	ipv6: use TOS marks from sockets for routing decision	2016-06-11 15:33:26 -07:00
l3mdev	net: l3mdev: Remove const from flowi6 arg to get_rt6_dst	2016-06-15 12:34:34 -07:00
lapb	net/lapb: tuse %*ph to dump buffers	2016-05-29 22:33:25 -07:00
llc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
mac80211	For the next cycle, we have the following:	2016-06-10 23:13:32 -07:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2016-03-19 10:05:34 -07:00
mpls	mpls: allow routes on ipgre devices	2016-06-16 17:12:07 -07:00
netfilter	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-06-10 11:52:24 -07:00
netlabel	netlabel: fix a problem with netlbl_secattr_catmap_setrng()	2016-04-05 16:10:47 -04:00
netlink	net/netlink/af_netlink.h: Remove unused structure.	2016-06-09 22:26:24 -07:00
netrom	…
nfc	nfc: nci: Add nci_nfcc_loopback to the nci core	2016-05-04 01:48:16 +02:00
openvswitch	openvswitch: Add packet truncation support.	2016-06-10 17:58:03 -07:00
packet	packet: use common code for virtio_net_hdr and skb GSO conversion	2016-06-10 23:03:56 -07:00
phonet	sock: struct proto hash function may error	2016-02-11 03:54:14 -05:00
qrtr	Merge tag 'qcom-soc-for-4.7-2' into net-next	2016-05-17 14:11:19 -04:00
rds	RDS: Update rds_conn_destroy to be MP capable	2016-06-14 23:50:44 -07:00
rfkill	rfkill: Use switch to demux userspace operations	2016-04-05 10:48:53 +02:00
rose	…
rxrpc	rxrpc: Rework local endpoint management	2016-06-15 15:38:17 +01:00
sched	net_sched: sch_fq: defer skb freeing	2016-06-15 14:08:36 -07:00
sctp	sctp: change sk state to CLOSED instead of CLOSING in sctp_sock_migrate	2016-06-16 14:10:44 -07:00
sunrpc	NFS client updates for Linux 4.7	2016-05-26 10:33:33 -07:00
switchdev	switchdev: pass pointer to fib_info instead of copy	2016-05-17 13:58:49 -04:00
tipc	tipc: add neighbor monitoring framework	2016-06-15 14:06:28 -07:00
unix	constify security_path_{mkdir,mknod,symlink}	2016-03-28 00:47:27 -04:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
wimax	net:wimax: Fix doucble word "the the" in networking.xml	2015-08-09 22:43:52 -07:00
wireless	For the next cycle, we have the following:	2016-06-10 23:13:32 -07:00
x25	net: fix a kernel infoleak in x25 module	2016-05-09 22:45:33 -04:00
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-05-09 15:59:24 -04:00
Kconfig	bpf: add generic constant blinding for use in jits	2016-05-16 13:49:32 -04:00
Makefile	net: Add Qualcomm IPC router	2016-05-08 23:46:14 -04:00
compat.c	packet: compat support for sock_fprog	2016-06-09 23:41:03 -07:00
socket.c	fs: poll/select/recvmmsg: use timespec64 for timeout events	2016-05-19 19:12:14 -07:00
sysctl_net.c	net: sysctl: fix a kmemleak warning	2015-10-23 06:22:08 -07:00