On Tue, Sep 15, 2015 at 11:09 AM, Pravin B Shelar <pshe...@nicira.com> wrote:
> From: Joe Stringer <joestrin...@nicira.com>
>
> Signed-off-by: Joe Stringer <joestrin...@nicira.com>
> Signed-off-by: Pravin B Shelar <pshe...@nicira.com>
At a first glance, it looks like there are a few commits in 4.1 that
aren't represented here:
netlink: implement nla_put_in_addr and nla_put_in6_addr
netlink: implement nla_get_in_addr and nla_get_in6_addr
openvswitch: disable LRO
> diff --git a/.travis.yml b/.travis.yml
> index d14f786..f4b9188 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -12,7 +12,8 @@ env:
> - TESTSUITE=1 KERNEL=3.18.1
> - TESTSUITE=1 OPTS="--enable-shared"
> - BUILD_ENV="-m32" OPTS="--disable-ssl"
> - - KERNEL=4.0.2
> + - KERNEL=4.1.6
> + - KERNEL=4.0.9
Is there a reason to have both 4.0 and 4.1 tested?
> diff --git a/datapath/datapath.h b/datapath/datapath.h
> index 526ddad..aca9407 100644
> --- a/datapath/datapath.h
> +++ b/datapath/datapath.h
> static inline struct net *ovs_dp_get_net(const struct datapath *dp)
> {
> - return read_pnet(&dp->net);
> + return rpl_read_pnet(&dp->net);
> }
>
> static inline void ovs_dp_set_net(struct datapath *dp, struct net *net)
> {
> - write_pnet(&dp->net, net);
> + rpl_write_pnet(&dp->net, net);
> }
Can we use macros here so we don't need to call the rpl_ versions directly?
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
