git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
net
/
via-velocity.h
diff --git
a/drivers/net/via-velocity.h
b/drivers/net/via-velocity.h
index
9a187de
..
1b70b7c
100644
(file)
--- a/
drivers/net/via-velocity.h
+++ b/
drivers/net/via-velocity.h
@@
-291,10
+291,10
@@
struct velocity_td_info {
dma_addr_t buf_dma;
};
dma_addr_t buf_dma;
};
-enum {
+enum
velocity_owner
{
OWNED_BY_HOST = 0,
OWNED_BY_NIC = 1
OWNED_BY_HOST = 0,
OWNED_BY_NIC = 1
-}
velocity_owner
;
+};
/*
/*
@@
-1270,7
+1270,7
@@
enum velocity_cam_type {
* provided mask buffer.
*/
* provided mask buffer.
*/
-static inline void mac_get_cam_mask(struct mac_regs * regs, u8 * mask, enum velocity_cam_type cam_type)
+static inline void mac_get_cam_mask(struct mac_regs
__iomem
* regs, u8 * mask, enum velocity_cam_type cam_type)
{
int i;
/* Select CAM mask */
{
int i;
/* Select CAM mask */
@@
-1302,7
+1302,7
@@
static inline void mac_get_cam_mask(struct mac_regs * regs, u8 * mask, enum velo
* Store a new mask into a CAM
*/
* Store a new mask into a CAM
*/
-static inline void mac_set_cam_mask(struct mac_regs * regs, u8 * mask, enum velocity_cam_type cam_type)
+static inline void mac_set_cam_mask(struct mac_regs
__iomem
* regs, u8 * mask, enum velocity_cam_type cam_type)
{
int i;
/* Select CAM mask */
{
int i;
/* Select CAM mask */
@@
-1333,7
+1333,7
@@
static inline void mac_set_cam_mask(struct mac_regs * regs, u8 * mask, enum velo
* Load an address or vlan tag into a CAM
*/
* Load an address or vlan tag into a CAM
*/
-static inline void mac_set_cam(struct mac_regs * regs, int idx, u8 *addr, enum velocity_cam_type cam_type)
+static inline void mac_set_cam(struct mac_regs
__iomem
* regs, int idx, u8 *addr, enum velocity_cam_type cam_type)
{
int i;
{
int i;
@@
-1375,7
+1375,7
@@
static inline void mac_set_cam(struct mac_regs * regs, int idx, u8 *addr, enum v
* the caller. VLAN tags are 2 bytes the address cam entries are 6.
*/
* the caller. VLAN tags are 2 bytes the address cam entries are 6.
*/
-static inline void mac_get_cam(struct mac_regs * regs, int idx, u8 *addr, enum velocity_cam_type cam_type)
+static inline void mac_get_cam(struct mac_regs
__iomem
* regs, int idx, u8 *addr, enum velocity_cam_type cam_type)
{
int i;
{
int i;
@@
-1414,7
+1414,7
@@
static inline void mac_get_cam(struct mac_regs * regs, int idx, u8 *addr, enum v
* the rest of the logic from the result of sleep/wakeup
*/
* the rest of the logic from the result of sleep/wakeup
*/
-inline static void mac_wol_reset(struct mac_regs * regs)
+inline static void mac_wol_reset(struct mac_regs
__iomem
* regs)
{
/* Turn off SWPTAG right after leaving power mode */
{
/* Turn off SWPTAG right after leaving power mode */
@@
-1739,10
+1739,6
@@
struct velocity_info {
struct net_device *dev;
struct net_device_stats stats;
struct net_device *dev;
struct net_device_stats stats;
-#ifdef CONFIG_PM
- u32 pci_state[16];
-#endif
-
dma_addr_t rd_pool_dma;
dma_addr_t td_pool_dma[TX_QUEUE_NO];
dma_addr_t rd_pool_dma;
dma_addr_t td_pool_dma[TX_QUEUE_NO];
@@
-1752,7
+1748,7
@@
struct velocity_info {
u8 ip_addr[4];
enum chip_type chip_id;
u8 ip_addr[4];
enum chip_type chip_id;
- struct mac_regs * mac_regs;
+ struct mac_regs
__iomem
* mac_regs;
unsigned long memaddr;
unsigned long ioaddr;
u32 io_size;
unsigned long memaddr;
unsigned long ioaddr;
u32 io_size;
@@
-1865,7
+1861,7
@@
static inline void velocity_update_hw_mibs(struct velocity_info *vptr)
static inline void init_flow_control_register(struct velocity_info *vptr)
{
static inline void init_flow_control_register(struct velocity_info *vptr)
{
- struct mac_regs * regs = vptr->mac_regs;
+ struct mac_regs
__iomem
* regs = vptr->mac_regs;
/* Set {XHITH1, XHITH0, XLTH1, XLTH0} in FlowCR1 to {1, 0, 1, 1}
depend on RD=64, and Turn on XNOEN in FlowCR1 */
/* Set {XHITH1, XHITH0, XLTH1, XLTH0} in FlowCR1 to {1, 0, 1, 1}
depend on RD=64, and Turn on XNOEN in FlowCR1 */