From patchwork Thu Aug 13 18:03:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarod Wilson X-Patchwork-Id: 507141 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 190631401E7 for ; Fri, 14 Aug 2015 04:04:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753668AbbHMSD6 (ORCPT ); Thu, 13 Aug 2015 14:03:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39486 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753139AbbHMSDX (ORCPT ); Thu, 13 Aug 2015 14:03:23 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id D091691D39; Thu, 13 Aug 2015 18:03:23 +0000 (UTC) Received: from hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com (hp-dl360pgen8-07.khw.lab.eng.bos.redhat.com [10.16.184.47]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t7DI3GDr003405; Thu, 13 Aug 2015 14:03:23 -0400 From: Jarod Wilson To: linux-kernel@vger.kernel.org Cc: Jarod Wilson , Jon Mason , netdev@vger.kernel.org Subject: [PATCH 6/6] ethernet/s2io: advertise what hw supports in vlan_features Date: Thu, 13 Aug 2015 14:03:00 -0400 Message-Id: <1439488980-44738-7-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> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For some reason, the s2io driver has never filled in vlan_features. If that's fully intentional, then this patch should be dropped. If its not, then this patch is necessary to maintain some functionality of slave s2io devices in a bonding group. Without this, the presence of a s2io 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: Jon Mason CC: netdev@vger.kernel.org Signed-off-by: Jarod Wilson --- drivers/net/ethernet/neterion/s2io.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 2d1b942..8bbf540 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -7922,6 +7922,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) NETIF_F_RXCSUM | NETIF_F_LRO; dev->features |= dev->hw_features | NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX; + dev->vlan_features |= dev->hw_features; if (sp->device_type & XFRAME_II_DEVICE) { dev->hw_features |= NETIF_F_UFO; if (ufo)