Re: [PATCH v5 net] stmmac: 802.1ad tag stripping fix

2018-06-03 Thread Toshiaki Makita
On 2018/06/03 23:33, David Miller wrote: > From: Elad Nachman > Date: Wed, 30 May 2018 08:48:25 +0300 > >> static void stmmac_rx_vlan(struct net_device *dev, struct sk_buff *skb) >> { >> -struct ethhdr *ehdr; >> +struct vlan_ethhdr *veth; >> u16 vlanid; >> +__be16 vlan_proto;

Re: [PATCH v5 net] stmmac: 802.1ad tag stripping fix

2018-06-03 Thread David Miller
From: Elad Nachman Date: Wed, 30 May 2018 08:48:25 +0300 > static void stmmac_rx_vlan(struct net_device *dev, struct sk_buff *skb) > { > - struct ethhdr *ehdr; > + struct vlan_ethhdr *veth; > u16 vlanid; > + __be16 vlan_proto; Please order local variables from longest to

Re: [PATCH v5 net] stmmac: 802.1ad tag stripping fix

2018-05-30 Thread Toshiaki Makita
On 2018/05/30 15:16, Elad Nachman wrote: > Interesting question. That's the way the driver was originally written and I > tried to minimize the changes in the patch. > Anyway, common.h (included by stmmac_main.c) contains the following: > > #if IS_ENABLED(CONFIG_VLAN_8021Q) > #define

Re: [PATCH v5 net] stmmac: 802.1ad tag stripping fix

2018-05-30 Thread Elad Nachman
Interesting question. That's the way the driver was originally written and I tried to minimize the changes in the patch. Anyway, common.h (included by stmmac_main.c) contains the following: #if IS_ENABLED(CONFIG_VLAN_8021Q) #define STMMAC_VLAN_TAG_USED #include #endif So the define in question

Re: [PATCH v5 net] stmmac: 802.1ad tag stripping fix

2018-05-30 Thread Toshiaki Makita
On 2018/05/30 14:48, 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

[PATCH v5 net] stmmac: 802.1ad tag stripping fix

2018-05-29 Thread Elad Nachman
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