diff options
| author | Javier Martinez Canillas <javier@osg.samsung.com> | 2016-09-12 16:03:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-13 05:27:59 +0200 |
| commit | 547e530a5e10fbc8e78bf2573508e46ca1bf571f (patch) | |
| tree | 083be6e2da728aa64247a72e7a7772e06471e79b /drivers/net/ethernet/sis/sis900.c | |
| parent | sfc: use IS_ENABLED() instead of checking for built-in or module (diff) | |
| download | linux-547e530a5e10fbc8e78bf2573508e46ca1bf571f.tar.xz linux-547e530a5e10fbc8e78bf2573508e46ca1bf571f.zip | |
sis900: use IS_ENABLED() instead of checking for built-in or module
The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.
Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.
Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Acked-by: Daniele Venzano <venza@brownhat.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sis/sis900.c')
| -rw-r--r-- | drivers/net/ethernet/sis/sis900.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sis/sis900.c b/drivers/net/ethernet/sis/sis900.c index 95001ee408ab..6f85276376e8 100644 --- a/drivers/net/ethernet/sis/sis900.c +++ b/drivers/net/ethernet/sis/sis900.c @@ -1426,7 +1426,7 @@ static void sis900_set_mode(struct sis900_private *sp, int speed, int duplex) rx_flags |= RxATX; } -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#if IS_ENABLED(CONFIG_VLAN_8021Q) /* Can accept Jumbo packet */ rx_flags |= RxAJAB; #endif @@ -1750,7 +1750,7 @@ static int sis900_rx(struct net_device *net_dev) data_size = rx_status & DSIZE; rx_size = data_size - CRC_SIZE; -#if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) +#if IS_ENABLED(CONFIG_VLAN_8021Q) /* ``TOOLONG'' flag means jumbo packet received. */ if ((rx_status & TOOLONG) && data_size <= MAX_FRAME_SIZE) rx_status &= (~ ((unsigned int)TOOLONG)); |