[ovs-git] Open vSwitch: datapath: Fix build with Linux 2.6.31. (citrix)

[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, citrix has been updated
       via  43a6c464efaf271411c8e2d19357e11bf6ff5afa (commit)
       via  5562d3ccd2073617fa2cb6a1384bbae0b5a08109 (commit)
       via  1b378b99f638212216f2090cb7be7efab3d90c14 (commit)
       via  7c40efc9d3a24a5ccd1415b46efff51060f85a57 (commit)
      from  43aa5f47f1ece799ebb85cd1c8ddfdaefe7b7402 (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 43a6c464efaf271411c8e2d19357e11bf6ff5afa
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=43a6c464efaf271411c8e2d19357e11bf6ff5afa
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Fix build with Linux 2.6.31.
		
Linux 2.6.31 breaks the network device functions pointers into a separate
"netdev_ops" structure, so we need to handle this case now too.


commit 5562d3ccd2073617fa2cb6a1384bbae0b5a08109
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=5562d3ccd2073617fa2cb6a1384bbae0b5a08109
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Ignore return value from rtnl_notify().
		
In Linux 2.6.30, the rtnl_notify() return type was changed from int to
void along with the following commit message:

    This patch also modifies the rtnetlink code to ignore the return
    value of rtnl_notify() in all callers. The function rtnl_notify()
    (before this patch) returned the error of the unicast notification
    which makes rtnl_set_sk_err() reports errors to all listeners. This
    is not of any help since the origin of the change (the socket that
    requested the echoing) notices the ENOBUFS error if the notification
    fails and should resync itself.

Thus there's no point in checking the return value, even in older versions
of the kernel, and so this commit changes our code to ignore it, even
on older kernel versions.  We also update the rtnl_notify() wrapper macros
to make the return type void on older kernel versions.

This has not been tested, just built.

Thanks to Mikio for spurring me to try building with Linux 2.6.29 and
2.6.30.


commit 1b378b99f638212216f2090cb7be7efab3d90c14
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=1b378b99f638212216f2090cb7be7efab3d90c14
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Fix warning on 64-bit builds.
		


commit 7c40efc9d3a24a5ccd1415b46efff51060f85a57
Diffs: http://openvswitch.org/cgi-bin/gitweb.cgi?p=openvswitch;a=commitdiff;h=7c40efc9d3a24a5ccd1415b46efff51060f85a57
Author: Ben Pfaff <blp at nicira.com>
		
datapath: Factor out code for getting and setting listen mask.
		
This fixes GCC warnings on 64-bit architectures caused by storing an "int"
in the "void *" f->private_data field.


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

Summary of changes:
 datapath/datapath.c                                |   23 +++++++++---
 datapath/dp_dev.c                                  |   35 ++++++++++++++++++--
 .../linux-2.6/compat-2.6/include/linux/rtnetlink.h |   12 ++++--
 3 files changed, 57 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Open vSwitch