linux.git/net/openvswitch/datapath.c, branch v3.19-rc2

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-11-22T03:28:24+00:00

Conflicts:
	drivers/net/ieee802154/fakehard.c

A bug fix went into 'net' for ieee802154/fakehard.c, which is removed
in 'net-next'.

Add build fix into the merge from Stephen Rothwell in openvswitch, the
logging macros take a new initial 'log' argument, a new call was added
in 'net' so when we merge that in here we have to explicitly add the
new 'log' arg to it else the build fails.

Signed-off-by: David S. Miller

vlan: introduce *vlan_hwaccel_push_inside helpers

2014-11-21T19:20:17+00:00

Use them to push skb->vlan_tci into the payload and avoid code
duplication.

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

vlan: rename __vlan_put_tag to vlan_insert_tag_set_proto

2014-11-21T19:20:17+00:00

Name fits better. Plus there's going to be introduced
__vlan_insert_tag later on.

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

openvswitch: Convert dp rcu read operation to locked operations

2014-11-14T23:13:26+00:00

dp read operations depends on ovs_dp_cmd_fill_info(). This API
needs to looup vport to find dp name, but vport lookup can
fail. Therefore to keep vport reference alive we need to
take ovs lock.

Introduced by commit 6093ae9abac1 ("openvswitch: Minimize
dp and vport critical sections").

Signed-off-by: Pravin B Shelar 
Acked-by: Andy Zhou

openvswitch: Add support for OVS_FLOW_ATTR_PROBE.

2014-11-10T02:58:44+00:00

This new flag is useful for suppressing error logging while probing
for datapath features using flow commands.  For backwards
compatibility reasons the commands are executed normally, but error
logging is suppressed.

Signed-off-by: Jarno Rajahalme 
Signed-off-by: Pravin B Shelar

openvswitch: Constify various function arguments

2014-11-10T02:58:44+00:00

Help produce better optimized code.

Signed-off-by: Thomas Graf 
Signed-off-by: Pravin B Shelar

openvswitch: Remove redundant key ref from upcall_info.

2014-11-10T02:58:44+00:00

struct dp_upcall_info has pointer to pkt_key which is already
available in OVS_CB.  This also simplifies upcall handling
for gso packet.

Signed-off-by: Pravin B Shelar 
Acked-by: Andy Zhou

openvswitch: Extend packet attribute for egress tunnel info

2014-11-10T02:58:44+00:00

OVS vswitch has extended IPFIX exporter to export tunnel headers
to improve network visibility.
To export this information userspace needs to know egress tunnel
for given packet. By extending packet attributes datapath can
export egress tunnel info for given packet. So that userspace
can ask for egress tunnel info in userspace action. This
information is used to build IPFIX data for given flow.

Signed-off-by: Wenyu Zhang 
Acked-by: Romain Lenglet 
Acked-by: Ben Pfaff 
Signed-off-by: Pravin B Shelar

openvswitch: Export symbols as GPL symbols.

2014-11-10T02:58:44+00:00

vport can be compiled as modules, therefore openvswitch needs
to export few symbols. Export them as GPL symbols.

CC: Thomas Graf 
Signed-off-by: Pravin B Shelar

openvswitch: Refactor action alloc and copy api.

2014-11-06T07:52:35+00:00

There are two separate API to allocate and copy actions list. Anytime
OVS needs to copy action list, it needs to call both functions.
Following patch moves action allocation to copy function to avoid
code duplication.

Signed-off-by: Pravin B Shelar 
Acked-by: Jarno Rajahalme