Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 652ef42c authored by Antoine Tenart's avatar Antoine Tenart Committed by David S. Miller
Browse files

net: mscc: fix the frame extraction into the skb 



When extracting frames from the Ocelot switch, the frame check sequence
(FCS) is present at the end of the data extracted. The FCS was put into
the sk buffer which introduced some issues (as length related ones), as
the FCS shouldn't be part of an Rx sk buffer.

This patch fixes the Ocelot switch extraction behaviour by discarding
the FCS.

Fixes: a556c76a ("net: mscc: Add initial Ocelot switch support")
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 10bc6a60

drivers/net/ethernet/mscc/ocelot_board.c

+9 −3
Original line number Original line Diff line number Diff line
@@ -91,7 +91,7 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) 
		struct sk_buff *skb;

		struct sk_buff *skb;

		struct net_device *dev;

		struct net_device *dev;

		u32 *buf;

		u32 *buf;

		int sz, len;

		int sz, len, buf_len;

		u32 ifh[4];

		u32 ifh[4];

		u32 val;

		u32 val;

		struct frame_info info;

		struct frame_info info;
@@ -116,14 +116,20 @@ static irqreturn_t ocelot_xtr_irq_handler(int irq, void *arg) 
			err = -ENOMEM;

			err = -ENOMEM;

			break;

			break;

		}

		}

		buf = (u32 *)skb_put(skb, info.len);

		buf_len = info.len - ETH_FCS_LEN;

		buf = (u32 *)skb_put(skb, buf_len);





		len = 0;

		len = 0;

		do {

		do {

			sz = ocelot_rx_frame_word(ocelot, grp, false, &val);

			sz = ocelot_rx_frame_word(ocelot, grp, false, &val);

			*buf++ = val;

			*buf++ = val;

			len += sz;

			len += sz;

		} while ((sz == 4) && (len < info.len));

		} while (len < buf_len);



		/* Read the FCS and discard it */

		sz = ocelot_rx_frame_word(ocelot, grp, false, &val);

		/* Update the statistics if part of the FCS was read before */

		len -= ETH_FCS_LEN - sz;





		if (sz < 0) {

		if (sz < 0) {

			err = sz;

			err = sz;