Commit 050f91dc authored Oct 04, 2009 by Thomas Chou Committed by David S. Miller Oct 07, 2009

ethoc: align received packet to make IP header at word boundary



The packet buffer is allocated at 4 bytes boundary, but the IP header
length and version bits is located at byte 14. These bit fields access
as 32 bits word and caused exception on processors that do not support
unaligned access.

The patch adds 2 bytes offset to make the bit fields word aligned.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 3ee19a85

drivers/net/ethoc.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -399,6 +399,10 @@ static int ethoc_rx(struct net_device *dev, int limit)
		if (ethoc_update_rx_stats(priv, &bd) == 0) {
		int size = bd.stat >> 16;
		struct sk_buff *skb = netdev_alloc_skb(dev, size);

		size -= 4; /* strip the CRC */
		skb_reserve(skb, 2); /* align TCP/IP header */

		if (likely(skb)) {
		void *src = phys_to_virt(bd.addr);
		memcpy_fromio(skb_put(skb, size), src, size);

Admin message