diff options
Diffstat (limited to 'net/x25/x25_dev.c')
-rw-r--r-- | net/x25/x25_dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index fa2b41888bd9..f0ce862d1f46 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c | |||
@@ -161,7 +161,7 @@ void x25_establish_link(struct x25_neigh *nb) | |||
161 | *ptr = X25_IFACE_CONNECT; | 161 | *ptr = X25_IFACE_CONNECT; |
162 | break; | 162 | break; |
163 | 163 | ||
164 | #if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) | 164 | #if IS_ENABLED(CONFIG_LLC) |
165 | case ARPHRD_ETHER: | 165 | case ARPHRD_ETHER: |
166 | return; | 166 | return; |
167 | #endif | 167 | #endif |
@@ -180,7 +180,7 @@ void x25_terminate_link(struct x25_neigh *nb) | |||
180 | struct sk_buff *skb; | 180 | struct sk_buff *skb; |
181 | unsigned char *ptr; | 181 | unsigned char *ptr; |
182 | 182 | ||
183 | #if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) | 183 | #if IS_ENABLED(CONFIG_LLC) |
184 | if (nb->dev->type == ARPHRD_ETHER) | 184 | if (nb->dev->type == ARPHRD_ETHER) |
185 | return; | 185 | return; |
186 | #endif | 186 | #endif |
@@ -213,7 +213,7 @@ void x25_send_frame(struct sk_buff *skb, struct x25_neigh *nb) | |||
213 | *dptr = X25_IFACE_DATA; | 213 | *dptr = X25_IFACE_DATA; |
214 | break; | 214 | break; |
215 | 215 | ||
216 | #if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE) | 216 | #if IS_ENABLED(CONFIG_LLC) |
217 | case ARPHRD_ETHER: | 217 | case ARPHRD_ETHER: |
218 | kfree_skb(skb); | 218 | kfree_skb(skb); |
219 | return; | 219 | return; |