diff mbox

[ovs-dev] Clean code in netlink-socket

Message ID 1456495819-6076-1-git-send-email-aserdean@cloudbasesolutions.com
State Accepted
Headers show

Commit Message

Alin Serdean Feb. 26, 2016, 2:10 p.m. UTC 
Found by inspection.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 lib/netlink-socket.c | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

Comments

Ben Pfaff Feb. 27, 2016, 12:52 a.m. UTC | #1 
On Fri, Feb 26, 2016 at 02:10:12PM +0000, Alin Serdean wrote:
> Found by inspection.
> 
> Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>

Applied to master, thanks.
diff mbox

Patch

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
index 5ef4b15..42d475b 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. */
@@ -567,7 +553,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;