git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/section-fix' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
sungem.h
diff --git
a/drivers/net/sungem.h
b/drivers/net/sungem.h
index
a70067c
..
f7a0291
100644
(file)
--- a/
drivers/net/sungem.h
+++ b/
drivers/net/sungem.h
@@
-828,8
+828,8
@@
* DMA mappings for a transmitted packet.
*/
struct gem_txd {
* DMA mappings for a transmitted packet.
*/
struct gem_txd {
-
u64
control_word;
-
u64
buffer;
+
__le64
control_word;
+
__le64
buffer;
};
#define TXDCTRL_BUFSZ 0x0000000000007fffULL /* Buffer Size */
};
#define TXDCTRL_BUFSZ 0x0000000000007fffULL /* Buffer Size */
@@
-863,8
+863,8
@@
struct gem_txd {
* by the host driver just as in the TX descriptor case above.
*/
struct gem_rxd {
* by the host driver just as in the TX descriptor case above.
*/
struct gem_rxd {
-
u64
status_word;
-
u64
buffer;
+
__le64
status_word;
+
__le64
buffer;
};
#define RXDCTRL_TCPCSUM 0x000000000000ffffULL /* TCP Pseudo-CSUM */
};
#define RXDCTRL_TCPCSUM 0x000000000000ffffULL /* TCP Pseudo-CSUM */
@@
-993,6
+993,7
@@
struct gem {
u32 msg_enable;
u32 status;
u32 msg_enable;
u32 status;
+ struct napi_struct napi;
struct net_device_stats net_stats;
int tx_fifo_sz;
struct net_device_stats net_stats;
int tx_fifo_sz;
@@
-1025,7
+1026,7
@@
struct gem {
struct pci_dev *pdev;
struct net_device *dev;
struct pci_dev *pdev;
struct net_device *dev;
-#if
def CONFIG_PPC_PMAC
+#if
defined(CONFIG_PPC_PMAC) || defined(CONFIG_SPARC)
struct device_node *of_node;
#endif
};
struct device_node *of_node;
#endif
};