datapath: Use "OVS_*" as opposed to "ODP_*" for user<->kernel interactions.

[openvswitch] / datapath / vport-capwap.c

diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index 65f1f1bdda515564e8e34ffd814e49a7bfa98306..2401088949855f191885c03e97276a6658c391a3 100644 (file)
--- a/datapath/vport-capwap.c
+++ b/datapath/vport-capwap.c
@@ -206,7 +206,7 @@ static int capwap_rcv(struct sock *sk, struct sk_buff *skb)
                goto error;
        }
 
-       tnl_rcv(vport, skb);
+       tnl_rcv(vport, skb, iph->tos);
        goto out;
 
 error:
@@ -648,7 +648,7 @@ static void capwap_frag_expire(unsigned long ifq)
 }
 
 const struct vport_ops capwap_vport_ops = {
-       .type           = ODP_VPORT_TYPE_CAPWAP,
+       .type           = OVS_VPORT_TYPE_CAPWAP,
        .flags          = VPORT_F_GEN_STATS,
        .init           = capwap_init,
        .exit           = capwap_exit,
@@ -664,5 +664,6 @@ const struct vport_ops capwap_vport_ops = {
        .get_operstate  = vport_gen_get_operstate,
        .send           = tnl_send,
 };
-
-#endif /* Linux kernel >= 2.6.26 */
+#else
+#warning CAPWAP tunneling will not be available on kernels before 2.6.26
+#endif /* Linux kernel < 2.6.26 */