[ovs-git] Open vSwitch: datapath: Account for RHEL6.4 backports in compat layer (branch-1.10)

dev at openvswitch.org dev at openvswitch.org
Mon Apr 29 17:29:35 UTC 2013


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, branch-1.10 has been updated
       via  4036665e1d47d6fa8aeea196e08048360893ce64 (commit)
       via  22778152e8eec5e58a077dc04a6efd4d19a75248 (commit)
      from  2d58ad0bf6b773c776e3091a89032e57dafc9b14 (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 4036665e1d47d6fa8aeea196e08048360893ce64
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=4036665e1d47d6fa8aeea196e08048360893ce64
Author: Thomas Graf <tgraf at redhat.com>
		
datapath: Account for RHEL6.4 backports in compat layer
		
Explicitly check the availability of several kernel API functions
instead of relying on the kernel version to account for Red Hat
Enterprise Linux backports.

Signed-off-by: Thomas Graf <tgraf at redhat.com>
Signed-off-by: Jesse Gross <jesse at nicira.com>
(cherry picked from commit 42d5dd9595cce35a8825a20be7d71a3a8f6f5640)

Conflicts:
	datapath/linux/compat/include/asm/percpu.h
	datapath/linux/compat/include/linux/netdevice.h


commit 22778152e8eec5e58a077dc04a6efd4d19a75248
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=22778152e8eec5e58a077dc04a6efd4d19a75248
Author: Thomas Graf <tgraf at redhat.com>
		
datapath: Use openvswitch_handle_frame hook in >=RHEL6.4 to live side by side with bridging
		
Due to the missing register rx_handler API in the kernel RHEL6 is
based on, the datapath currently falls back to using the bridging
hook with the consequence that bridging and OVS cannot be used in
parallel on any RHEL6 release.

For this purpose, >=RHEL6.4 releases provide a special rx frame hook
to be used by OVS. It captures frames at the same location in the
stack as the rx_handler would do in more recent kernel releases. In
order to store the vport pointer, the net_device's ax25_ptr field is
utilized under the assumption that an AX25 device will never be
attached to an OVS bridge.

Signed-off-by: Thomas Graf <tgraf at redhat.com>
Signed-off-by: Jesse Gross <jesse at nicira.com>
(cherry picked from commit f285d3e715512571c4b2f92a4d1c65022bbcc9d5)

Conflicts:
	datapath/vport-netdev.c


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

Summary of changes:
 acinclude.m4                                |    7 +++++
 datapath/linux/compat/include/net/netlink.h |    8 +++++-
 datapath/linux/compat/netdevice.c           |    2 +
 datapath/vport-netdev.c                     |   34 +++++++++++++++++++++++---
 4 files changed, 46 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Open vSwitch



More information about the git mailing list