Doug / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit 29c36262383d37c6149cf26afd39c3389dd23135

Authored by Igor Maravić
Committed by David S. Miller
1 parent a3bf7ae9ae
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

net:x25: use IS_ENABLED 

Use IS_ENABLED(CONFIG_FOO)
instead of defined(CONFIG_FOO) || defined (CONFIG_FOO_MODULE)

Signed-off-by: Igor Maravić <igorm@etf.rs>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 3 changed files with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -232,7 +232,7 @@
232 232 return NOTIFY_DONE;
233 233  
234 234 if (dev->type == ARPHRD_X25
235   -#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
  235 +#if IS_ENABLED(CONFIG_LLC)
236 236 || dev->type == ARPHRD_ETHER
237 237 #endif
238 238 ) {
... ... @@ -161,7 +161,7 @@
161 161 *ptr = X25_IFACE_CONNECT;
162 162 break;
163 163  
164   -#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
  164 +#if IS_ENABLED(CONFIG_LLC)
165 165 case ARPHRD_ETHER:
166 166 return;
167 167 #endif
... ... @@ -180,7 +180,7 @@
180 180 struct sk_buff *skb;
181 181 unsigned char *ptr;
182 182  
183   -#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
  183 +#if IS_ENABLED(CONFIG_LLC)
184 184 if (nb->dev->type == ARPHRD_ETHER)
185 185 return;
186 186 #endif
... ... @@ -213,7 +213,7 @@
213 213 *dptr = X25_IFACE_DATA;
214 214 break;
215 215  
216   -#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
  216 +#if IS_ENABLED(CONFIG_LLC)
217 217 case ARPHRD_ETHER:
218 218 kfree_skb(skb);
219 219 return;
... ... @@ -134,7 +134,7 @@
134 134  
135 135 if (dev &&
136 136 (!(dev->flags & IFF_UP) || (dev->type != ARPHRD_X25
137   -#if defined(CONFIG_LLC) || defined(CONFIG_LLC_MODULE)
  137 +#if IS_ENABLED(CONFIG_LLC)
138 138 && dev->type != ARPHRD_ETHER
139 139 #endif
140 140 ))){