From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753794AbbHMSE1 (ORCPT ); Thu, 13 Aug 2015 14:04:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49768 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753585AbbHMSDX (ORCPT ); Thu, 13 Aug 2015 14:03:23 -0400 From: Jarod Wilson To: linux-kernel@vger.kernel.org Cc: Jarod Wilson , Shahed Shaikh , Dept-GELinuxNICDev@qlogic.com, netdev@vger.kernel.org Subject: [PATCH 5/6] ethernet/qlcnic: advertise LRO support in vlan_features Date: Thu, 13 Aug 2015 14:02:59 -0400 Message-Id: <1439488980-44738-6-git-send-email-jarod@redhat.com> In-Reply-To: <1439488980-44738-1-git-send-email-jarod@redhat.com> References: <1439488980-44738-1-git-send-email-jarod@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Without this, the presence of a qlcnic device in a bond will not trigger LRO support to be enabled at the bond level, even while it is enabled on the slave itself. This change becomes necessary when NETIF_F_LRO is added to netdev_features.h's NETIF_F_ONE_FOR_ALL. CC: Shahed Shaikh CC: Dept-GELinuxNICDev@qlogic.com CC: netdev@vger.kernel.org Signed-off-by: Jarod Wilson --- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 8b08b20..5a798ab 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2314,8 +2314,10 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, struct net_device *netdev, if (qlcnic_sriov_vf_check(adapter)) netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER; - if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO) + if (adapter->ahw->capabilities & QLCNIC_FW_CAPABILITY_HW_LRO) { netdev->features |= NETIF_F_LRO; + netdev->vlan_features |= NETIF_F_LRO; + } if (qlcnic_encap_tx_offload(adapter)) { netdev->features |= NETIF_F_GSO_UDP_TUNNEL; -- 1.8.3.1