ofp-util: Rename struct flow_stats_request with ofputil_ prefix.

[openvswitch] / datapath / vport-capwap.c

diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index 4fb43933021ad4e93c0b6fa354fdfb3d909fcfd9..f0bb3270fc45c9f692f014cd3da83535a2b84d23 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:
@@ -654,7 +654,6 @@ const struct vport_ops capwap_vport_ops = {
        .exit           = capwap_exit,
        .create         = capwap_create,
        .destroy        = tnl_destroy,
-       .set_mtu        = tnl_set_mtu,
        .set_addr       = tnl_set_addr,
        .get_name       = tnl_get_name,
        .get_addr       = tnl_get_addr,
@@ -663,8 +662,8 @@ const struct vport_ops capwap_vport_ops = {
        .get_dev_flags  = vport_gen_get_dev_flags,
        .is_running     = vport_gen_is_running,
        .get_operstate  = vport_gen_get_operstate,
-       .get_mtu        = tnl_get_mtu,
        .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 */