patch-2.4.8 linux/drivers/net/sk98lin/skge.c
Next file: linux/drivers/net/sk98lin/skproc.c
Previous file: linux/drivers/net/pcmcia/ibmtr_cs.c
Back to the patch index
Back to the overall index
- Lines: 187
- Date:
Tue Aug 7 08:30:50 2001
- Orig file:
v2.4.7/linux/drivers/net/sk98lin/skge.c
- Orig date:
Wed Jul 25 17:10:21 2001
diff -u --recursive --new-file v2.4.7/linux/drivers/net/sk98lin/skge.c linux/drivers/net/sk98lin/skge.c
@@ -368,7 +368,7 @@
/* global variables *********************************************************/
static const char *BootString = BOOT_STRING;
-static struct net_device *root_dev = NULL;
+struct net_device *sk98lin_root_dev = NULL;
static int probed __initdata = 0;
struct inode_operations SkInodeOps;
//static struct file_operations SkFileOps; /* with open/relase */
@@ -685,7 +685,7 @@
static int __init skge_init_module(void)
{
int cards;
- root_dev = NULL;
+ sk98lin_root_dev = NULL;
/* just to avoid warnings ... */
debug = 0;
@@ -717,12 +717,12 @@
unsigned long Flags;
SK_EVPARA EvPara;
- while (root_dev) {
- pNet = (DEV_NET*) root_dev->priv;
+ while (sk98lin_root_dev) {
+ pNet = (DEV_NET*) sk98lin_root_dev->priv;
pAC = pNet->pAC;
next = pAC->Next;
- netif_stop_queue(root_dev);
+ netif_stop_queue(sk98lin_root_dev);
SkGeYellowLED(pAC, pAC->IoBase, 0);
if(pAC->BoardLevel == 2) {
@@ -754,17 +754,17 @@
kfree(pAC->dev[1]);
}
- FreeResources(root_dev);
+ FreeResources(sk98lin_root_dev);
- root_dev->get_stats = NULL;
+ sk98lin_root_dev->get_stats = NULL;
/*
* otherwise unregister_netdev calls get_stats with
* invalid IO ... :-(
*/
- unregister_netdev(root_dev);
- kfree(root_dev);
+ unregister_netdev(sk98lin_root_dev);
+ kfree(sk98lin_root_dev);
kfree(pAC);
- root_dev = next;
+ sk98lin_root_dev = next;
}
/* clear proc-dir */
@@ -911,8 +911,8 @@
/*
* Register the device here
*/
- pAC->Next = root_dev;
- root_dev = dev;
+ pAC->Next = sk98lin_root_dev;
+ sk98lin_root_dev = dev;
return (0);
} /* SkGeBoardInit */
@@ -1473,7 +1473,7 @@
{
DEV_NET *pNet;
SK_AC *pAC;
-unsigned int Flags; /* for spin lock */
+unsigned long Flags; /* for spin lock */
int i;
SK_EVPARA EvPara; /* an event parameter union */
@@ -1580,7 +1580,7 @@
DEV_NET *pNet;
SK_AC *pAC;
-unsigned int Flags; /* for spin lock */
+unsigned long Flags; /* for spin lock */
int i;
int PortIdx;
SK_EVPARA EvPara;
@@ -1732,7 +1732,7 @@
struct sk_buff *pMessage) /* pointer to send-message */
{
TXD *pTxd; /* the rxd to fill */
-unsigned int Flags;
+unsigned long Flags;
SK_U64 PhysAddr;
int BytesSend;
@@ -1898,7 +1898,7 @@
RX_PORT *pRxPort) /* ptr to port struct for which the ring
should be filled */
{
-unsigned int Flags;
+unsigned long Flags;
spin_lock_irqsave(&pRxPort->RxDesRingLock, Flags);
while (pRxPort->RxdRingFree > pRxPort->RxFillLimit) {
@@ -2329,7 +2329,7 @@
RX_PORT *pRxPort) /* pointer to rx port struct */
{
RXD *pRxd; /* pointer to the current descriptor */
-unsigned int Flags;
+unsigned long Flags;
SK_U64 PhysAddr;
if (pRxPort->RxdRingFree == pAC->RxDescrPerRing) {
@@ -2376,7 +2376,7 @@
{
TXD *pTxd; /* pointer to the current descriptor */
int i;
-unsigned int Flags;
+unsigned long Flags;
spin_lock_irqsave(&pTxPort->TxDesRingLock, Flags);
pTxd = pTxPort->pTxdRingHead;
@@ -2500,8 +2500,8 @@
SK_AC *pAC = pNet->pAC;
struct sockaddr *addr = p;
-unsigned int Flags;
-
+unsigned long Flags;
+
SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
("SkGeSetMacAddr starts now...\n"));
if(netif_running(dev)) {
@@ -2548,7 +2548,7 @@
struct dev_mc_list *pMcList;
int i;
int PortIdx;
-unsigned int Flags;
+unsigned long Flags;
SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
("SkGeSetRxMode starts now... "));
@@ -2619,7 +2619,7 @@
DEV_NET *pNet;
DEV_NET *pOtherNet;
SK_AC *pAC;
-unsigned int Flags;
+unsigned long Flags;
int i;
SK_EVPARA EvPara;
@@ -2842,7 +2842,7 @@
SK_PNMI_STRUCT_DATA *pPnmiStruct; /* structure for all Pnmi-Data */
SK_PNMI_STAT *pPnmiStat; /* pointer to virtual XMAC stat. data */SK_PNMI_CONF *pPnmiConf; /* pointer to virtual link config. */
unsigned int Size; /* size of pnmi struct */
-unsigned int Flags; /* for spin lock */
+unsigned long Flags; /* for spin lock */
SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
("SkGeStats starts now...\n"));
@@ -2966,7 +2966,7 @@
unsigned int Size, /* length of ioctl data */
int mode) /* flag for set/preset */
{
-unsigned int Flags; /* for spin lock */
+unsigned long Flags; /* for spin lock */
SK_AC *pAC;
SK_DBG_MSG(NULL, SK_DBGMOD_DRV, SK_DBGCAT_DRV_ENTRY,
@@ -3370,7 +3370,7 @@
int StrLen = 80; /* length of the string, defined in SK_AC */
char Keyword[] = VPD_NAME; /* vpd productname identifier */
int ReturnCode; /* return code from vpd_read */
-unsigned int Flags;
+unsigned long Flags;
spin_lock_irqsave(&pAC->SlowPathLock, Flags);
ReturnCode = VpdRead(pAC, pAC->IoBase, Keyword, pAC->DeviceStr,
@@ -3639,7 +3639,7 @@
int ToPort; /* the port we switch to */
SK_EVPARA NewPara; /* parameter for further events */
int Stat;
-unsigned int Flags;
+unsigned long Flags;
switch (Event) {
case SK_DRV_ADAP_FAIL:
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)