diff mbox

ixgbe: Remove NETIF_F_HW_VLAN_CTAG_FILTER from hw_features

Message ID 20150311030305.1337.10832.stgit@ahduyck-vm-fedora20
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Alexander Duyck March 11, 2015, 3:03 a.m. UTC
This change makes it so that the HW_VLAN_STAG_FILTER bit is not falsely
advertised as being a feature that can be toggled on ixgbe parts.  The
driver was setting the bit in features and letting it be inherited by
hw_features, however the driver was actually ignoring the value of the bit
and just assuming it was always set.  As a result VLAN filtering was always
enabled which is a requirement for SR-IOV, VMDq, DCB, FCoE, and possibly
other features within the adapters.

Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Hiroshi Shimamoto March 12, 2015, 6 a.m. UTC | #1
> Subject: [PATCH] ixgbe: Remove NETIF_F_HW_VLAN_CTAG_FILTER from hw_features

> 

> This change makes it so that the HW_VLAN_STAG_FILTER bit is not falsely


s/STAG/CTAG/ right?

thanks,
Hiroshi

> advertised as being a feature that can be toggled on ixgbe parts.  The

> driver was setting the bit in features and letting it be inherited by

> hw_features, however the driver was actually ignoring the value of the bit

> and just assuming it was always set.  As a result VLAN filtering was always

> enabled which is a requirement for SR-IOV, VMDq, DCB, FCoE, and possibly

> other features within the adapters.

> 

> Signed-off-by: Alexander Duyck <alexander.h.duyck@redhat.com>

> ---

>  drivers/net/ethernet/intel/ixgbe/ixgbe_main.c |    2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

> 

> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

> index 21aea7e..08c27ed 100644

> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

> @@ -8406,7 +8406,6 @@ skip_sriov:

>  			   NETIF_F_IPV6_CSUM |

>  			   NETIF_F_HW_VLAN_CTAG_TX |

>  			   NETIF_F_HW_VLAN_CTAG_RX |

> -			   NETIF_F_HW_VLAN_CTAG_FILTER |

>  			   NETIF_F_TSO |

>  			   NETIF_F_TSO6 |

>  			   NETIF_F_RXHASH |

> @@ -8428,6 +8427,7 @@ skip_sriov:

>  	}

> 

>  	netdev->hw_features |= NETIF_F_RXALL;

> +	netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;

> 

>  	netdev->vlan_features |= NETIF_F_TSO;

>  	netdev->vlan_features |= NETIF_F_TSO6;
Alexander Duyck March 12, 2015, 3:16 p.m. UTC | #2
On 03/11/2015 11:00 PM, Hiroshi Shimamoto wrote:
>> Subject: [PATCH] ixgbe: Remove NETIF_F_HW_VLAN_CTAG_FILTER from hw_features
>>
>> This change makes it so that the HW_VLAN_STAG_FILTER bit is not falsely
> s/STAG/CTAG/ right?
>
> thanks,
> Hiroshi
>

Yeah, I I'm not sure where the S came from.  Maybe I was looking at 
something else when I was typing.

I'll submit a v2 with updated patch comments.

- Alex
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 21aea7e..08c27ed 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -8406,7 +8406,6 @@  skip_sriov:
 			   NETIF_F_IPV6_CSUM |
 			   NETIF_F_HW_VLAN_CTAG_TX |
 			   NETIF_F_HW_VLAN_CTAG_RX |
-			   NETIF_F_HW_VLAN_CTAG_FILTER |
 			   NETIF_F_TSO |
 			   NETIF_F_TSO6 |
 			   NETIF_F_RXHASH |
@@ -8428,6 +8427,7 @@  skip_sriov:
 	}
 
 	netdev->hw_features |= NETIF_F_RXALL;
+	netdev->features |= NETIF_F_HW_VLAN_CTAG_FILTER;
 
 	netdev->vlan_features |= NETIF_F_TSO;
 	netdev->vlan_features |= NETIF_F_TSO6;