diff options
Diffstat (limited to 'drivers/net/sk98lin/h/skdrv2nd.h')
-rw-r--r-- | drivers/net/sk98lin/h/skdrv2nd.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/sk98lin/h/skdrv2nd.h b/drivers/net/sk98lin/h/skdrv2nd.h index 2dc5728e3ef6..778d9e618ebd 100644 --- a/drivers/net/sk98lin/h/skdrv2nd.h +++ b/drivers/net/sk98lin/h/skdrv2nd.h | |||
@@ -60,7 +60,6 @@ extern SK_U64 SkOsGetTime(SK_AC*); | |||
60 | extern int SkPciReadCfgDWord(SK_AC*, int, SK_U32*); | 60 | extern int SkPciReadCfgDWord(SK_AC*, int, SK_U32*); |
61 | extern int SkPciReadCfgWord(SK_AC*, int, SK_U16*); | 61 | extern int SkPciReadCfgWord(SK_AC*, int, SK_U16*); |
62 | extern int SkPciReadCfgByte(SK_AC*, int, SK_U8*); | 62 | extern int SkPciReadCfgByte(SK_AC*, int, SK_U8*); |
63 | extern int SkPciWriteCfgDWord(SK_AC*, int, SK_U32); | ||
64 | extern int SkPciWriteCfgWord(SK_AC*, int, SK_U16); | 63 | extern int SkPciWriteCfgWord(SK_AC*, int, SK_U16); |
65 | extern int SkPciWriteCfgByte(SK_AC*, int, SK_U8); | 64 | extern int SkPciWriteCfgByte(SK_AC*, int, SK_U8); |
66 | extern int SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA); | 65 | extern int SkDrvEvent(SK_AC*, SK_IOC IoC, SK_U32, SK_EVPARA); |
@@ -268,8 +267,6 @@ typedef struct s_DevNet DEV_NET; | |||
268 | struct s_DevNet { | 267 | struct s_DevNet { |
269 | int PortNr; | 268 | int PortNr; |
270 | int NetNr; | 269 | int NetNr; |
271 | int Mtu; | ||
272 | int Up; | ||
273 | SK_AC *pAC; | 270 | SK_AC *pAC; |
274 | }; | 271 | }; |
275 | 272 | ||
@@ -298,6 +295,7 @@ struct s_RxPort { | |||
298 | RXD *pRxdRingTail; /* Tail of Rx rings */ | 295 | RXD *pRxdRingTail; /* Tail of Rx rings */ |
299 | RXD *pRxdRingPrev; /* descriptor given to BMU previously */ | 296 | RXD *pRxdRingPrev; /* descriptor given to BMU previously */ |
300 | int RxdRingFree; /* # of free entrys */ | 297 | int RxdRingFree; /* # of free entrys */ |
298 | int RxCsum; /* use receive checksum hardware */ | ||
301 | spinlock_t RxDesRingLock; /* serialize descriptor accesses */ | 299 | spinlock_t RxDesRingLock; /* serialize descriptor accesses */ |
302 | int RxFillLimit; /* limit for buffers in ring */ | 300 | int RxFillLimit; /* limit for buffers in ring */ |
303 | SK_IOC HwAddr; /* bmu registers address */ | 301 | SK_IOC HwAddr; /* bmu registers address */ |
@@ -390,12 +388,10 @@ struct s_AC { | |||
390 | 388 | ||
391 | SK_IOC IoBase; /* register set of adapter */ | 389 | SK_IOC IoBase; /* register set of adapter */ |
392 | int BoardLevel; /* level of active hw init (0-2) */ | 390 | int BoardLevel; /* level of active hw init (0-2) */ |
393 | char DeviceStr[80]; /* adapter string from vpd */ | 391 | |
394 | SK_U32 AllocFlag; /* flag allocation of resources */ | 392 | SK_U32 AllocFlag; /* flag allocation of resources */ |
395 | struct pci_dev *PciDev; /* for access to pci config space */ | 393 | struct pci_dev *PciDev; /* for access to pci config space */ |
396 | SK_U32 PciDevId; /* pci device id */ | ||
397 | struct SK_NET_DEVICE *dev[2]; /* pointer to device struct */ | 394 | struct SK_NET_DEVICE *dev[2]; /* pointer to device struct */ |
398 | char Name[30]; /* driver name */ | ||
399 | 395 | ||
400 | int RxBufSize; /* length of receive buffers */ | 396 | int RxBufSize; /* length of receive buffers */ |
401 | struct net_device_stats stats; /* linux 'netstat -i' statistics */ | 397 | struct net_device_stats stats; /* linux 'netstat -i' statistics */ |
@@ -430,7 +426,6 @@ struct s_AC { | |||
430 | DIM_INFO DynIrqModInfo; /* all data related to DIM */ | 426 | DIM_INFO DynIrqModInfo; /* all data related to DIM */ |
431 | 427 | ||
432 | /* Only for tests */ | 428 | /* Only for tests */ |
433 | int PortUp; | ||
434 | int PortDown; | 429 | int PortDown; |
435 | int ChipsetType; /* Chipset family type | 430 | int ChipsetType; /* Chipset family type |
436 | * 0 == Genesis family support | 431 | * 0 == Genesis family support |