From: Peng Li <lipeng321@huawei.com>
To: <davem@davemloft.net>
Cc: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<linuxarm@huawei.com>, <salil.mehta@huawei.com>,
<lipeng321@huawei.com>
Subject: [PATCH net-next 11/11] net: hns3: check for NULL function pointer in hns3_nic_set_features
Date: Thu, 11 Jan 2018 19:46:06 +0800 [thread overview]
Message-ID: <1515671166-48006-12-git-send-email-lipeng321@huawei.com> (raw)
In-Reply-To: <1515671166-48006-1-git-send-email-lipeng321@huawei.com>
From: Jian Shen <shenjian15@huawei.com>
It's necessary to check hook whether being defined before
calling, improve the reliability.
Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Peng Li <lipeng321@huawei.com>
---
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
index a7ae4f3..ac84816 100644
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
@@ -1133,14 +1133,16 @@ static int hns3_nic_set_features(struct net_device *netdev,
}
}
- if (changed & NETIF_F_HW_VLAN_CTAG_FILTER) {
+ if ((changed & NETIF_F_HW_VLAN_CTAG_FILTER) &&
+ h->ae_algo->ops->enable_vlan_filter) {
if (features & NETIF_F_HW_VLAN_CTAG_FILTER)
h->ae_algo->ops->enable_vlan_filter(h, true);
else
h->ae_algo->ops->enable_vlan_filter(h, false);
}
- if (changed & NETIF_F_HW_VLAN_CTAG_RX) {
+ if ((changed & NETIF_F_HW_VLAN_CTAG_RX) &&
+ h->ae_algo->ops->enable_hw_strip_rxvtag) {
if (features & NETIF_F_HW_VLAN_CTAG_RX)
ret = h->ae_algo->ops->enable_hw_strip_rxvtag(h, true);
else
--
1.9.1
next prev parent reply other threads:[~2018-01-11 11:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-11 11:45 [PATCH net-next 00/11] add some new features and fix some bugs Peng Li
2018-01-11 11:45 ` [PATCH net-next 01/11] net: hns3: add ethtool_ops.get_channels support for VF Peng Li
2018-01-11 11:45 ` [PATCH net-next 02/11] net: hns3: remove TSO config command from VF driver Peng Li
2018-01-11 11:45 ` [PATCH net-next 03/11] net: hns3: add ethtool_ops.get_coalesce support to PF Peng Li
2018-01-11 11:45 ` [PATCH net-next 04/11] net: hns3: add ethtool_ops.set_coalesce " Peng Li
2018-01-11 11:46 ` [PATCH net-next 05/11] net: hns3: refactor interrupt coalescing init function Peng Li
2018-01-11 11:46 ` [PATCH net-next 06/11] net: hns3: refactor GL update function Peng Li
2018-01-11 11:46 ` [PATCH net-next 07/11] net: hns3: remove unused GL setup function Peng Li
2018-01-11 11:46 ` [PATCH net-next 08/11] net: hns3: change the unit of GL value macro Peng Li
2018-01-11 11:46 ` [PATCH net-next 09/11] net: hns3: add int_gl_idx setup for TX and RX queues Peng Li
2018-01-11 11:46 ` [PATCH net-next 10/11] net: hns3: add feature check when feature changed Peng Li
2018-01-11 11:46 ` Peng Li [this message]
2018-01-11 17:07 ` [PATCH net-next 00/11] add some new features and fix some bugs David Miller
2018-01-12 3:26 ` lipeng (Y)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1515671166-48006-12-git-send-email-lipeng321@huawei.com \
--to=lipeng321@huawei.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=netdev@vger.kernel.org \
--cc=salil.mehta@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).