linux-toradex.git/net/openvswitch, branch v4.3-rc2

openvswitch: Remove conntrack Kconfig option.

2015-09-07T06:48:33+00:00

There's no particular desire to have conntrack action support in Open
vSwitch as an independently configurable bit, rather just to ensure
there is not a hard dependency. This exposed option doesn't accurately
reflect the conntrack dependency when enabled, so simplify this by
removing the option. Compile the support if NF_CONNTRACK is enabled.

Fixes: 7f8a436eaa2c ("openvswitch: Add conntrack action")
Signed-off-by: Joe Stringer 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

ip-tunnel: Use API to access tunnel metadata options.

2015-08-31T19:28:56+00:00

Currently tun-info options pointer is used in few cases to
pass options around. But tunnel options can be accessed using
ip_tunnel_info_opts() API without using the pointer. Following
patch removes the redundant pointer and consistently make use
of API.

Signed-off-by: Pravin B Shelar 
Acked-by: Thomas Graf 
Reviewed-by: Jesse Gross 
Signed-off-by: David S. Miller

openvswitch: Remove vport-net

2015-08-30T02:07:15+00:00

This structure is not used anymore.

Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Remove vport stats.

2015-08-30T02:07:15+00:00

Since all vport types are now backed by netdev, we can directly
use netdev stats. Following patch removes redundant stat
from vport.

Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Remove egress_tun_info.

2015-08-30T02:07:15+00:00

tun info is passed using skb-dst pointer. Now we have
converted all vports to netdev based implementation so
Now we can remove redundant pointer to tun-info from OVS_CB.

Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Remove vport get_name()

2015-08-30T02:07:15+00:00

Remove unused get_name() function pointer from vport ops.

Signed-off-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: retain parsed IPv6 header fields in flow on error skipping extension headers

2015-08-29T20:39:59+00:00

When an error occurs skipping IPv6 extension headers retain the already
parsed IP protocol and IPv6 addresses in the flow. Also assume that the
packet is not a fragment in the absence of information to the contrary;
that is always use the frag_off value set by ipv6_skip_exthdr().

This allows matching on the IP protocol and IPv6 addresses of packets
with malformed extension headers.

Signed-off-by: Simon Horman 
Signed-off-by: David S. Miller

ip_tunnels: record IP version in tunnel info

2015-08-29T20:07:54+00:00

There's currently nothing preventing directing packets with IPv6
encapsulation data to IPv4 tunnels (and vice versa). If this happens,
IPv6 addresses are incorrectly interpreted as IPv4 ones.

Track whether the given ip_tunnel_key contains IPv4 or IPv6 data. Store this
in ip_tunnel_info. Reject packets at appropriate places if they are supposed
to be encapsulated into an incompatible protocol.

Signed-off-by: Jiri Benc 
Acked-by: Alexei Starovoitov 
Acked-by: Thomas Graf 
Acked-by: Pravin B Shelar 
Signed-off-by: David S. Miller

openvswitch: Fix conntrack compilation without mark.

2015-08-29T05:23:59+00:00

Fix build with !CONFIG_NF_CONNTRACK_MARK && CONFIG_OPENVSWITCH_CONNTRACK

Fixes: 182e304 ("openvswitch: Allow matching on conntrack mark")
Reported-by: Simon Horman 
Signed-off-by: Joe Stringer 
Tested-by: Simon Horman 
Signed-off-by: David S. Miller

openswitch: fix typo CONFIG_NF_CONNTRACK_LABEL

2015-08-28T20:39:53+00:00

Fix typo in conntrack.c
s/CONFIG_NF_CONNTRACK_LABEL/CONFIG_NF_CONNTRACK_LABELS/

Signed-off-by: Valentin Rothberg 
Signed-off-by: David S. Miller