diff options
author | Parav Pandit <parav@mellanox.com> | 2017-02-04 12:00:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-02-06 16:33:29 -0500 |
commit | d0d7b10b05945f40fefd4e60f457c61aefa3e9a9 (patch) | |
tree | 1904a8455fc02954af05242261ee36feb1e45d1d /net/hsr | |
parent | 73cfb2a2e49e166c569360ee60fe023b3efe3cf6 (diff) |
net-next: treewide use is_vlan_dev() helper function.
This patch makes use of is_vlan_dev() function instead of flag
comparison which is exactly done by is_vlan_dev() helper function.
Signed-off-by: Parav Pandit <parav@mellanox.com>
Reviewed-by: Daniel Jurgens <danielj@mellanox.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Jon Maxwell <jmaxwell37@gmail.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Acked-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/hsr')
-rw-r--r-- | net/hsr/hsr_slave.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/hsr/hsr_slave.c b/net/hsr/hsr_slave.c index f5b60388d02f..56080da4aa77 100644 --- a/net/hsr/hsr_slave.c +++ b/net/hsr/hsr_slave.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include "hsr_slave.h" | 12 | #include "hsr_slave.h" |
13 | #include <linux/etherdevice.h> | 13 | #include <linux/etherdevice.h> |
14 | #include <linux/if_arp.h> | 14 | #include <linux/if_arp.h> |
15 | #include <linux/if_vlan.h> | ||
15 | #include "hsr_main.h" | 16 | #include "hsr_main.h" |
16 | #include "hsr_device.h" | 17 | #include "hsr_device.h" |
17 | #include "hsr_forward.h" | 18 | #include "hsr_forward.h" |
@@ -81,7 +82,7 @@ static int hsr_check_dev_ok(struct net_device *dev) | |||
81 | return -EINVAL; | 82 | return -EINVAL; |
82 | } | 83 | } |
83 | 84 | ||
84 | if (dev->priv_flags & IFF_802_1Q_VLAN) { | 85 | if (is_vlan_dev(dev)) { |
85 | netdev_info(dev, "HSR on top of VLAN is not yet supported in this driver.\n"); | 86 | netdev_info(dev, "HSR on top of VLAN is not yet supported in this driver.\n"); |
86 | return -EINVAL; | 87 | return -EINVAL; |
87 | } | 88 | } |