SUNRPC: Don't auto-disconnect from the local rpcbind socket

[linux-3.10.git] / net / x25 / x25_route.c

diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index 97d77c532d8c95550711c915cb2b02d65d99828f..277c8d2448d68f43d2bc31b686abbb7957b6a659 100644 (file)
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -66,7 +66,7 @@ out:
 
 /**
  * __x25_remove_route - remove route from x25_route_list
- * @rt - route to remove
+ * @rt: route to remove
  *
  * Remove route from x25_route_list. If it was there.
  * Caller must hold x25_route_list_lock.
@@ -134,7 +134,7 @@ struct net_device *x25_dev_get(char *devname)
 
        if (dev &&
            (!(dev->flags & IFF_UP) || (dev->type != ARPHRD_X25
-#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
+#if IS_ENABLED(CONFIG_LLC)
                                        && dev->type != ARPHRD_ETHER
 #endif
                                        ))){