| Message ID | 20241016-fec-cleanups-v1-10-de783bd15e6a@pengutronix.de (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | net: fec: cleanups, update quirk, update IRQ naming | expand |
On Wed, Oct 16, 2024 at 11:51:58PM +0200, Marc Kleine-Budde wrote: > In order to clean up the VLAN handling, replace an open coded cast > from skb->data to the vlan header with skb_vlan_eth_hdr(). Replace manual VLAN header calculation with skb_vlan_eth_hdr() Use the provided helper function skb_vlan_eth_hdr() to replace manual VLAN header calculation for better readability and maintainability. Reviewed-by: Frank Li <Frank.Li@nxp.com> > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- > drivers/net/ethernet/freescale/fec_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c > index eb26e869c026225194f4df66db145494408bfe8a..fd7a78ec5fa8ac0f7d141779938a4690594dbef1 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -1819,8 +1819,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) > fep->bufdesc_ex && > (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) { > /* Push and remove the vlan tag */ > - struct vlan_hdr *vlan_header = > - (struct vlan_hdr *) (data + ETH_HLEN); > + struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb); > vlan_tag = ntohs(vlan_header->h_vlan_TCI); > > vlan_packet_rcvd = true; > > -- > 2.45.2 > >
> -----Original Message----- > From: Marc Kleine-Budde <mkl@pengutronix.de> > Sent: 2024年10月17日 5:52 > To: Wei Fang <wei.fang@nxp.com>; Shenwei Wang <shenwei.wang@nxp.com>; > Clark Wang <xiaoning.wang@nxp.com>; David S. Miller > <davem@davemloft.net>; Eric Dumazet <edumazet@google.com>; Jakub > Kicinski <kuba@kernel.org>; Paolo Abeni <pabeni@redhat.com>; Richard > Cochran <richardcochran@gmail.com> > Cc: imx@lists.linux.dev; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; > kernel@pengutronix.de; Marc Kleine-Budde <mkl@pengutronix.de> > Subject: [PATCH net-next 10/13] net: fec: fec_enet_rx_queue(): replace open > coded cast by skb_vlan_eth_hdr() > > In order to clean up the VLAN handling, replace an open coded cast > from skb->data to the vlan header with skb_vlan_eth_hdr(). > > Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > --- > drivers/net/ethernet/freescale/fec_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/freescale/fec_main.c > b/drivers/net/ethernet/freescale/fec_main.c > index > eb26e869c026225194f4df66db145494408bfe8a..fd7a78ec5fa8ac0f7d141779 > 938a4690594dbef1 100644 > --- a/drivers/net/ethernet/freescale/fec_main.c > +++ b/drivers/net/ethernet/freescale/fec_main.c > @@ -1819,8 +1819,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 > queue_id, int budget) > fep->bufdesc_ex && > (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) { > /* Push and remove the vlan tag */ > - struct vlan_hdr *vlan_header = > - (struct vlan_hdr *) (data + ETH_HLEN); > + struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb); > vlan_tag = ntohs(vlan_header->h_vlan_TCI); > > vlan_packet_rcvd = true; > > -- > 2.45.2 > Reviewed-by: Wei Fang <wei.fang@nxp.com>
On 16.10.2024 22:44:18, Frank Li wrote: > On Wed, Oct 16, 2024 at 11:51:58PM +0200, Marc Kleine-Budde wrote: > > In order to clean up the VLAN handling, replace an open coded cast > > from skb->data to the vlan header with skb_vlan_eth_hdr(). > > Replace manual VLAN header calculation with skb_vlan_eth_hdr() > > Use the provided helper function skb_vlan_eth_hdr() to replace manual VLAN > header calculation for better readability and maintainability. Fixed, Marc
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index eb26e869c026225194f4df66db145494408bfe8a..fd7a78ec5fa8ac0f7d141779938a4690594dbef1 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -1819,8 +1819,7 @@ fec_enet_rx_queue(struct net_device *ndev, u16 queue_id, int budget) fep->bufdesc_ex && (ebdp->cbd_esc & cpu_to_fec32(BD_ENET_RX_VLAN))) { /* Push and remove the vlan tag */ - struct vlan_hdr *vlan_header = - (struct vlan_hdr *) (data + ETH_HLEN); + struct vlan_ethhdr *vlan_header = skb_vlan_eth_hdr(skb); vlan_tag = ntohs(vlan_header->h_vlan_TCI); vlan_packet_rcvd = true;
In order to clean up the VLAN handling, replace an open coded cast from skb->data to the vlan header with skb_vlan_eth_hdr(). Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/ethernet/freescale/fec_main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)