[ovs-git] Open vSwitch: datapath: struct brport_attribute no longer has an owner element (master)

[dev at openvswitch.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Open vSwitch".

The branch, master has been updated
       via  e97f8ca76dfcc88d3ea20efe55969391252f83f3 (commit)
       via  67b30fcde789088b2e43407167f9ad656c2cc1e5 (commit)
       via  37f055c758e2d74ee4abc1ebca94aa62700f3ca0 (commit)
       via  f59a10a8b676546d120136e20445212c848e7c95 (commit)
       via  acf8144fa6b325a2e4b1cdf8fe116472f2ca7aca (commit)
       via  33ef7695b71a71f2d0bb0e00aab46855afb8c2a6 (commit)
       via  431585099e82a88a23d5dec28138b5a3a8bb11da (commit)
      from  4b70d8583bd8b4fd328cae192be5c60a761e73b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e97f8ca76dfcc88d3ea20efe55969391252f83f3
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=e97f8ca76dfcc88d3ea20efe55969391252f83f3
Author: Simon Horman <horms at verge.net.au>
		
datapath: struct brport_attribute no longer has an owner element
		
Between 2.6.35 and 2.6.36-rc1 the owner element of struct brport_attribute
was removed.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Jesse Gross <jesse at nicira.com>


commit 67b30fcde789088b2e43407167f9ad656c2cc1e5
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=67b30fcde789088b2e43407167f9ad656c2cc1e5
Author: Simon Horman <horms at verge.net.au>
		
datapath: Use rtnl_link_stats64
		
This adds compatibility with a series kernel changesets that
introduces 64bit statistics. The final changeset (to date) being
"net: Document that dev_get_stats() returns the given pointer".
The relevant changesets were added between 2.6.35 and 2.6.36-rc1.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Jesse Gross <jesse at nicira.com>


commit 37f055c758e2d74ee4abc1ebca94aa62700f3ca0
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=37f055c758e2d74ee4abc1ebca94aa62700f3ca0
Author: Simon Horman <horms at verge.net.au>
		
datapath: use rx_handler_data pointer
		
This adds compatibility with kernel changeset
"bridge: use rx_handler_data pointer to store net_bridge_port pointer"
which was added between 2.6.35 and 2.6.36-rc1.

With this change it is now safe to (attempt to) insert both bridge and
datapath with newer (>=2.6.36) kernels, although whichever is inserted
second will fail to initialise on the call to netdev_rx_handler_register()

Signed-off-by: Simon Horman <horms at verge.net.au>
[Jesse: fixed merge conflicts in vport-netdev.c and netdevice.h]
Signed-off-by: Jesse Gross <jesse at nicira.com>


commit f59a10a8b676546d120136e20445212c848e7c95
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=f59a10a8b676546d120136e20445212c848e7c95
Author: Simon Horman <horms at verge.net.au>
		
datapath: Take a rcu_dereference() in netdev_get_vport()
		
Although not strictly necessary, this will make this
function more consistent when compatibility for 2.6.36 is added.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Jesse Gross <jesse at nicira.com>


commit acf8144fa6b325a2e4b1cdf8fe116472f2ca7aca
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=acf8144fa6b325a2e4b1cdf8fe116472f2ca7aca
Author: Simon Horman <horms at verge.net.au>
		
datapath: rtable may not have a u. member
		
This brings the code up to sync with the kernel as
of changeset "net-next: remove useless union keyword",
which was added between 2.6.35 and 2.6.36-rc1

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Jesse Gross <jesse at nicira.com>


commit 33ef7695b71a71f2d0bb0e00aab46855afb8c2a6
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=33ef7695b71a71f2d0bb0e00aab46855afb8c2a6
Author: Simon Horman <horms at verge.net.au>
		
datapath: Handle duplicate netdev in netdev_rx_handler_register()
		
For kernels that have netdev_rx_handler_register() (>=2.6.35),
duplicate netdevs are detected by netdev_rx_handler_register().
So by adding duplicate detection to the netdev_rx_handler_register()
compatibility code the explicit check in netdev_create() can be removed.

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Jesse Gross <jesse at nicira.com>


commit 431585099e82a88a23d5dec28138b5a3a8bb11da
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=431585099e82a88a23d5dec28138b5a3a8bb11da
Author: Simon Horman <horms at verge.net.au>
		
datapath: dont use non-existent receive hooks
		
This adds compatibility with kernel changeset
of changeset "net: add rx_handler data pointer"
and thus "net: replace hooks in __netif_receive_skb V5",
which were added between 2.6.35 and 2.6.36-rc1

Signed-off-by: Simon Horman <horms at verge.net.au>
Signed-off-by: Jesse Gross <jesse at nicira.com>


-----------------------------------------------------------------------

Summary of changes:
 datapath/dp_sysfs_if.c                             |   10 +++
 datapath/linux-2.6/compat-2.6/include/linux/if.h   |    7 ++
 .../linux-2.6/compat-2.6/include/linux/netdevice.h |   16 ++++
 datapath/vport-gre.c                               |   16 +++-
 datapath/vport-netdev.c                            |   80 +++++++++++++++-----
 5 files changed, 106 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
Open vSwitch