On 2018/05/27 4:24, Elad Nachman wrote: > stmmac reception handler calls stmmac_rx_vlan() to strip the vlan before > calling napi_gro_receive(). > > The function assumes VLAN tagged frames are always tagged with 802.1Q > protocol, > and assigns ETH_P_8021Q to the skb by hard-coding the parameter on call to > __vlan_hwaccel_put_tag() . > > This causes packets not to be passed to the VLAN slave if it was created with > 802.1AD protocol > (ip link add link eth0 eth0.100 type vlan proto 802.1ad id 100). > > This fix passes the protocol from the VLAN header into > __vlan_hwaccel_put_tag() > instead of using the hard-coded value of ETH_P_8021Q. > NETIF_F_HW_VLAN_CTAG_RX check was removed to be in line with the driver > actual abilities. > > Signed-off-by: Elad Nachman <el...@gilat.com> >
I might have not been clear enough but you still need this hunk with this change. > - ndev->features |= NETIF_F_HW_VLAN_CTAG_RX; > + ndev->features |= (NETIF_F_HW_VLAN_CTAG_RX|NETIF_F_HW_VLAN_STAG_RX); Also I guess spaces are preferred around '|'. Would you check it by checkpatch.pl? -- Toshiaki Makita
