Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 40e4783ee62ac656a9a0fa3b512b6aee4f07d2d1

Authored by Igor Maravic
Committed by David S. Miller
1 parent 0a5912db7b
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

ipv4: arp: Cleanup in arp.c 

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

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

Showing 1 changed file with 10 additions and 10 deletions Side-by-side Diff

... ... @@ -277,9 +277,9 @@
277 277 default:
278 278 break;
279 279 case ARPHRD_ROSE:
280   -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
  280 +#if IS_ENABLED(CONFIG_AX25)
281 281 case ARPHRD_AX25:
282   -#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
  282 +#if IS_ENABLED(CONFIG_NETROM)
283 283 case ARPHRD_NETROM:
284 284 #endif
285 285 neigh->ops = &arp_broken_ops;
286 286  
... ... @@ -629,13 +629,13 @@
629 629 arp->ar_pro = htons(ETH_P_IP);
630 630 break;
631 631  
632   -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
  632 +#if IS_ENABLED(CONFIG_AX25)
633 633 case ARPHRD_AX25:
634 634 arp->ar_hrd = htons(ARPHRD_AX25);
635 635 arp->ar_pro = htons(AX25_P_IP);
636 636 break;
637 637  
638   -#if defined(CONFIG_NETROM) || defined(CONFIG_NETROM_MODULE)
  638 +#if IS_ENABLED(CONFIG_NETROM)
639 639 case ARPHRD_NETROM:
640 640 arp->ar_hrd = htons(ARPHRD_NETROM);
641 641 arp->ar_pro = htons(AX25_P_IP);
642 642  
... ... @@ -643,13 +643,13 @@
643 643 #endif
644 644 #endif
645 645  
646   -#if defined(CONFIG_FDDI) || defined(CONFIG_FDDI_MODULE)
  646 +#if IS_ENABLED(CONFIG_FDDI)
647 647 case ARPHRD_FDDI:
648 648 arp->ar_hrd = htons(ARPHRD_ETHER);
649 649 arp->ar_pro = htons(ETH_P_IP);
650 650 break;
651 651 #endif
652   -#if defined(CONFIG_TR) || defined(CONFIG_TR_MODULE)
  652 +#if IS_ENABLED(CONFIG_TR)
653 653 case ARPHRD_IEEE802_TR:
654 654 arp->ar_hrd = htons(ARPHRD_IEEE802);
655 655 arp->ar_pro = htons(ETH_P_IP);
... ... @@ -1036,7 +1036,7 @@
1036 1036 return -EINVAL;
1037 1037 }
1038 1038 switch (dev->type) {
1039   -#if defined(CONFIG_FDDI) || defined(CONFIG_FDDI_MODULE)
  1039 +#if IS_ENABLED(CONFIG_FDDI)
1040 1040 case ARPHRD_FDDI:
1041 1041 /*
1042 1042 * According to RFC 1390, FDDI devices should accept ARP
... ... @@ -1282,7 +1282,7 @@
1282 1282 }
1283 1283  
1284 1284 #ifdef CONFIG_PROC_FS
1285   -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
  1285 +#if IS_ENABLED(CONFIG_AX25)
1286 1286  
1287 1287 /* ------------------------------------------------------------------------ */
1288 1288 /*
... ... @@ -1330,7 +1330,7 @@
1330 1330  
1331 1331 read_lock(&n->lock);
1332 1332 /* Convert hardware address to XX:XX:XX:XX ... form. */
1333   -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
  1333 +#if IS_ENABLED(CONFIG_AX25)
1334 1334 if (hatype == ARPHRD_AX25 || hatype == ARPHRD_NETROM)
1335 1335 ax2asc2((ax25_address *)n->ha, hbuffer);
1336 1336 else {
... ... @@ -1343,7 +1343,7 @@
1343 1343 if (k != 0)
1344 1344 --k;
1345 1345 hbuffer[k] = 0;
1346   -#if defined(CONFIG_AX25) || defined(CONFIG_AX25_MODULE)
  1346 +#if IS_ENABLED(CONFIG_AX25)
1347 1347 }
1348 1348 #endif
1349 1349 sprintf(tbuf, "%pI4", n->primary_key);