diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-04-21 18:26:56 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-04-21 18:26:56 -0400 |
| commit | e2bca7c76a79b68506bfc3699beb74c0d41fe230 (patch) | |
| tree | 1b0269083de5ccc61a96b615ef271098df8e1b6a /drivers/net/gianfar.h | |
| parent | b3c7740a120c8a7775cb63b4d094466da5c01692 (diff) | |
| parent | d54a45e2533ef33678dc340298b022a289d2b3e3 (diff) | |
Merge branch 'for_2.6.34rc_a' of git://git.pwsan.com/linux-2.6 into omap-fixes-for-linus
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 3d72dc43dca5..17d25e714236 100644 --- a/drivers/net/gianfar.h +++ b/drivers/net/gianfar.h | |||
| @@ -566,6 +566,12 @@ struct rxfcb { | |||
| 566 | u16 vlctl; /* VLAN control word */ | 566 | u16 vlctl; /* VLAN control word */ |
| 567 | }; | 567 | }; |
| 568 | 568 | ||
| 569 | struct gianfar_skb_cb { | ||
| 570 | int alignamount; | ||
| 571 | }; | ||
| 572 | |||
| 573 | #define GFAR_CB(skb) ((struct gianfar_skb_cb *)((skb)->cb)) | ||
| 574 | |||
| 569 | struct rmon_mib | 575 | struct rmon_mib |
| 570 | { | 576 | { |
| 571 | u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */ | 577 | u32 tr64; /* 0x.680 - Transmit and Receive 64-byte Frame Counter */ |