From d71c423edf5d7e9377957dddc0c72d1d0c1375b1 Mon Sep 17 00:00:00 2001 From: Alin Serdean Date: Fri, 26 Feb 2016 14:10:12 +0000 Subject: [PATCH] Clean code in netlink-socket Found by inspection. Signed-off-by: Alin Gabriel Serdean Signed-off-by: Ben Pfaff --- lib/netlink-socket.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c index bb45bb114..1a1b5e42a 100644 --- a/lib/netlink-socket.c +++ b/lib/netlink-socket.c @@ -49,20 +49,6 @@ COVERAGE_DEFINE(netlink_sent); #define SOL_NETLINK 270 #endif -#ifdef _WIN32 -static struct ovs_mutex portid_mutex = OVS_MUTEX_INITIALIZER; -static uint32_t g_last_portid = 0; - -/* Port IDs must be unique! */ -static uint32_t -portid_next(void) - OVS_GUARDED_BY(portid_mutex) -{ - g_last_portid++; - return g_last_portid; -} -#endif /* _WIN32 */ - /* A single (bad) Netlink message can in theory dump out many, many log * messages, so the burst size is set quite high here to avoid missing useful * information. Also, at high logging levels we log *all* Netlink messages. */ @@ -568,7 +554,7 @@ nl_sock_recv__(struct nl_sock *sock, struct ofpbuf *buf, bool wait) if (!DeviceIoControl(sock->handle, sock->read_ioctl, NULL, 0, tail, sizeof tail, &bytes, NULL)) { VLOG_DBG_RL(&rl, "fatal driver failure in transact: %s", - ovs_lasterror_to_string()); + ovs_lasterror_to_string()); retval = -1; /* XXX: Map to a more appropriate error. */ errno = EINVAL; -- 2.20.1