X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=net%2Fx25%2Fx25_route.c;fp=net%2Fx25%2Fx25_route.c;h=9fbe4bb38d942ee2e2c6a22feb45a62500581796;hb=13458ffe0a953e17587f172a8e5059c243e6850a;hp=ec2a39e9b3e630bb8dc0fcd1cee1750f7dcc2503;hpb=0b9b241406818a871c6d25390aa487dba966d548;p=linux-2.6-microblaze.git

diff --git a/net/x25/x25_route.c b/net/x25/x25_route.c
index ec2a39e9b3e6..9fbe4bb38d94 100644
--- a/net/x25/x25_route.c
+++ b/net/x25/x25_route.c
@@ -124,12 +124,7 @@ struct net_device *x25_dev_get(char *devname)
 {
 	struct net_device *dev = dev_get_by_name(&init_net, devname);
 
-	if (dev &&
-	    (!(dev->flags & IFF_UP) || (dev->type != ARPHRD_X25
-#if IS_ENABLED(CONFIG_LLC)
-					&& dev->type != ARPHRD_ETHER
-#endif
-					))){
+	if (dev && (!(dev->flags & IFF_UP) || dev->type != ARPHRD_X25)) {
 		dev_put(dev);
 		dev = NULL;
 	}