projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ofp-util: Rename struct flow_mod to struct ofputil_flow_mod.
[openvswitch]
/
datapath
/
vport-capwap.c
diff --git
a/datapath/vport-capwap.c
b/datapath/vport-capwap.c
index 65f1f1bdda515564e8e34ffd814e49a7bfa98306..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;
}
goto error;
}
- tnl_rcv(vport, skb);
+ tnl_rcv(vport, skb
, iph->tos
);
goto out;
error:
goto out;
error:
@@
-664,5
+664,6
@@
const struct vport_ops capwap_vport_ops = {
.get_operstate = vport_gen_get_operstate,
.send = tnl_send,
};
.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 */