diff options
| author | Ben Menchaca <ben@bigfootnetworks.com> | 2010-03-24 05:05:02 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-26 20:16:23 -0700 |
| commit | a6d36d5689b1806a3365c909192e9f03a43a632b (patch) | |
| tree | 19de0640cf7f9c8cf634ac2d1c334094303e5bd8 /drivers/net/gianfar.h | |
| parent | af06393bbde6e8d474622a0517cffc662676e3fe (diff) | |
| download | kernel_samsung_smdk4412-a6d36d5689b1806a3365c909192e9f03a43a632b.zip kernel_samsung_smdk4412-a6d36d5689b1806a3365c909192e9f03a43a632b.tar.gz kernel_samsung_smdk4412-a6d36d5689b1806a3365c909192e9f03a43a632b.tar.bz2 | |
gianfar: fix undo of reserve()
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>
Diffstat (limited to 'drivers/net/gianfar.h')
| -rw-r--r-- | drivers/net/gianfar.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/gianfar.h b/drivers/net/gianfar.h index 3d72dc4..17d25e7 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h @@ -566,6 +566,12 @@ struct rxfcb { u16 vlctl; /* VLAN control word */ }; +struct gianfar_skb_cb { + int alignamount; +}; + +#define GFAR_CB(skb) ((struct gianfar_skb_cb *)((skb)->cb)) + struct rmon_mib { u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */ |