Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 09:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

gianfar: fix undo of reserve()

Browse Source 
Fix undo of reserve() before RX recycle

gfar_new_skb reserve()s space in the SKB to align it.  If an error occurs,
and the skb needs to be returned to the RX recycle queue, the current code
attempts to reset head, but did not reset tail.  This patch remembers the
alignment amount, and reverses the reserve() when needed.

Signed-off-by: Ben Menchaca <ben@bigfootnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ben Menchaca 2010-03-24 05:05:02 +00:00 committed by David S. Miller
parent af06393bbd
commit a6d36d5689
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/gianfar.c
View File

@ -2393,6 +2393,7 @@ struct sk_buff * gfar_new_skb(struct net_device *dev)
* as many bytes as needed to align the data properly * as many bytes as needed to align the data properly
*/ */
skb_reserve(skb, alignamount); skb_reserve(skb, alignamount);
GFAR_CB(skb)->alignamount = alignamount;
return skb; return skb;
} }
@ -2533,13 +2534,13 @@ int gfar_clean_rx_ring(struct gfar_priv_rx_q *rx_queue, int rx_work_limit)
newskb = skb; newskb = skb;
else if (skb) { else if (skb) {
/* /*
* We need to reset ->data to what it * We need to un-reserve() the skb to what it
* was before gfar_new_skb() re-aligned * was before gfar_new_skb() re-aligned
* it to an RXBUF_ALIGNMENT boundary * it to an RXBUF_ALIGNMENT boundary
* before we put the skb back on the * before we put the skb back on the
* recycle list. * recycle list.
*/ */
skb->data = skb->head + NET_SKB_PAD; skb_reserve(skb, -GFAR_CB(skb)->alignamount);
__skb_queue_head(&priv->rx_recycle, skb); __skb_queue_head(&priv->rx_recycle, skb);
} }
} else { } else {

6
drivers/net/gianfar.h
View File

@ -566,6 +566,12 @@ struct rxfcb {
u16 vlctl; /* VLAN control word */ u16 vlctl; /* VLAN control word */
}; };
struct gianfar_skb_cb {
int alignamount;
};
#define GFAR_CB(skb) ((struct gianfar_skb_cb *)((skb)->cb))
struct rmon_mib struct rmon_mib
{ {
u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */ u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */