From 13458ffe0a953e17587f172a8e5059c243e6850a Mon Sep 17 00:00:00 2001 From: Xie He Date: Tue, 8 Dec 2020 19:33:46 -0800 Subject: net: x25: Remove unimplemented X.25-over-LLC code stubs According to the X.25 documentation, there was a plan to implement X.25-over-802.2-LLC. It never finished but left various code stubs in the X.25 code. At this time it is unlikely that it would ever finish so it may be better to remove those code stubs. Also change the documentation to make it clear that this is not a ongoing plan anymore. Change words like "will" to "could", "would", etc. Cc: Martin Schiller Signed-off-by: Xie He Link: https://lore.kernel.org/r/20201209033346.83742-1-xie.he.0141@gmail.com Signed-off-by: Jakub Kicinski --- net/x25/x25_route.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'net/x25/x25_route.c') 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; } -- cgit v1.2.3-59-g8ed1b