X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fvport-capwap.c;h=e17d85faad9393493d584dda9470bfedc844b56a;hb=cdee00f;hp=f732657fefc25dd68867a5247ddfc0dedcb9ff58;hpb=b279fccf5bd8c5addfb8e73b04103405b6a8237e;p=openvswitch

diff --git a/datapath/vport-capwap.c b/datapath/vport-capwap.c
index f732657f..e17d85fa 100644
--- a/datapath/vport-capwap.c
+++ b/datapath/vport-capwap.c
@@ -212,7 +212,7 @@ out:
 	return 0;
 }
 
-const struct tnl_ops capwap_tnl_ops = {
+static const struct tnl_ops capwap_tnl_ops = {
 	.tunnel_type	= TNL_T_PROTO_CAPWAP,
 	.ipproto	= IPPROTO_UDP,
 	.hdr_len	= capwap_hdr_len,
@@ -220,9 +220,9 @@ const struct tnl_ops capwap_tnl_ops = {
 	.update_header	= capwap_update_header,
 };
 
-static struct vport *capwap_create(const char *name, const void __user *config)
+static struct vport *capwap_create(const struct vport_parms *parms)
 {
-	return tnl_create(name, config, &capwap_vport_ops, &capwap_tnl_ops);
+	return tnl_create(parms, &capwap_vport_ops, &capwap_tnl_ops);
 }
 
 /* Random value.  Irrelevant as long as it's not 0 since we set the handler. */
@@ -237,7 +237,7 @@ static int capwap_init(void)
 		goto error;
 
 	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
+	sin.sin_addr.s_addr = htonl(INADDR_ANY);
 	sin.sin_port = htons(CAPWAP_DST_PORT);
 
 	err = kernel_bind(capwap_rcv_socket, (struct sockaddr *)&sin,