Merge branch 'ovs-v6-build-err'
authorDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 23:35:51 +0000 (16:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 27 Aug 2015 23:35:51 +0000 (16:35 -0700)
commitd3a730971b90dd150e43c924b1b4dec8197fccad
treecaf81ab183fa7fc058a7ddd1bbae8e2ee4bd94df
parentc4d3e22438d405b84c00710aad177184d789353f
parent7b85b4dff2caa5e52726093fd058f87bbc14f156
Merge branch 'ovs-v6-build-err'

Joe Stringer says:

====================
OPENVSWITCH && !NETFILTER build fix.

Fix issues reported by kbuild test robot:

All error/warnings (new ones prefixed by >>):

   net/openvswitch/actions.c: In function 'ovs_fragment':
>> net/openvswitch/actions.c:705:16: error: implicit declaration of
function 'nf_get_ipv6_ops' [-Werror=implicit-function-declaration]
      const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
                   ^
>> net/openvswitch/actions.c:705:37: warning: initialization makes
pointer from integer without a cast
      const struct nf_ipv6_ops *v6ops = nf_get_ipv6_ops();
                                        ^
>> net/openvswitch/actions.c:707:19: error: storage size of 'ovs_rt'
isn't known
      struct rt6_info ovs_rt;
                      ^
>> net/openvswitch/actions.c:724:8: error: dereferencing pointer to
incomplete type
      v6ops->fragment(skb->sk, skb, ovs_vport_output);
           ^
>> net/openvswitch/actions.c:707:19: warning: unused variable 'ovs_rt'
[-Wunused-variable]
      struct rt6_info ovs_rt;
                      ^
   cc1: some warnings being treated as errors
====================

Signed-off-by: David S. Miller <davem@davemloft.net>