Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
1f8fc993
Commit
1f8fc993
authored
Nov 18, 2005
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream-jgarzik' of
git://git.tuxdriver.com/git/netdev-jwl
parents
638cbac8
7635d345
Changes
7
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
784 additions
and
774 deletions
+784
-774
drivers/net/sk98lin/h/skdrv2nd.h
drivers/net/sk98lin/h/skdrv2nd.h
+0
-1
drivers/net/sk98lin/h/skvpd.h
drivers/net/sk98lin/h/skvpd.h
+0
-8
drivers/net/sk98lin/skge.c
drivers/net/sk98lin/skge.c
+21
-22
drivers/net/wan/lmc/lmc_prot.h
drivers/net/wan/lmc/lmc_prot.h
+0
-15
drivers/net/wireless/atmel.c
drivers/net/wireless/atmel.c
+762
-728
drivers/net/wireless/hostap/Makefile
drivers/net/wireless/hostap/Makefile
+1
-0
drivers/net/wireless/hostap/hostap_main.c
drivers/net/wireless/hostap/hostap_main.c
+0
-0
No files found.
drivers/net/sk98lin/h/skdrv2nd.h
View file @
1f8fc993
...
@@ -60,7 +60,6 @@ extern SK_U64 SkOsGetTime(SK_AC*);
...
@@ -60,7 +60,6 @@ extern SK_U64 SkOsGetTime(SK_AC*);
extern
int
SkPciReadCfgDWord
(
SK_AC
*
,
int
,
SK_U32
*
);
extern
int
SkPciReadCfgDWord
(
SK_AC
*
,
int
,
SK_U32
*
);
extern
int
SkPciReadCfgWord
(
SK_AC
*
,
int
,
SK_U16
*
);
extern
int
SkPciReadCfgWord
(
SK_AC
*
,
int
,
SK_U16
*
);
extern
int
SkPciReadCfgByte
(
SK_AC
*
,
int
,
SK_U8
*
);
extern
int
SkPciReadCfgByte
(
SK_AC
*
,
int
,
SK_U8
*
);
extern
int
SkPciWriteCfgDWord
(
SK_AC
*
,
int
,
SK_U32
);
extern
int
SkPciWriteCfgWord
(
SK_AC
*
,
int
,
SK_U16
);
extern
int
SkPciWriteCfgWord
(
SK_AC
*
,
int
,
SK_U16
);
extern
int
SkPciWriteCfgByte
(
SK_AC
*
,
int
,
SK_U8
);
extern
int
SkPciWriteCfgByte
(
SK_AC
*
,
int
,
SK_U8
);
extern
int
SkDrvEvent
(
SK_AC
*
,
SK_IOC
IoC
,
SK_U32
,
SK_EVPARA
);
extern
int
SkDrvEvent
(
SK_AC
*
,
SK_IOC
IoC
,
SK_U32
,
SK_EVPARA
);
...
...
drivers/net/sk98lin/h/skvpd.h
View file @
1f8fc993
...
@@ -130,14 +130,12 @@ typedef struct s_vpd_key {
...
@@ -130,14 +130,12 @@ typedef struct s_vpd_key {
#ifndef VPD_DO_IO
#ifndef VPD_DO_IO
#define VPD_OUT8(pAC,IoC,Addr,Val) (void)SkPciWriteCfgByte(pAC,Addr,Val)
#define VPD_OUT8(pAC,IoC,Addr,Val) (void)SkPciWriteCfgByte(pAC,Addr,Val)
#define VPD_OUT16(pAC,IoC,Addr,Val) (void)SkPciWriteCfgWord(pAC,Addr,Val)
#define VPD_OUT16(pAC,IoC,Addr,Val) (void)SkPciWriteCfgWord(pAC,Addr,Val)
#define VPD_OUT32(pAC,IoC,Addr,Val) (void)SkPciWriteCfgDWord(pAC,Addr,Val)
#define VPD_IN8(pAC,IoC,Addr,pVal) (void)SkPciReadCfgByte(pAC,Addr,pVal)
#define VPD_IN8(pAC,IoC,Addr,pVal) (void)SkPciReadCfgByte(pAC,Addr,pVal)
#define VPD_IN16(pAC,IoC,Addr,pVal) (void)SkPciReadCfgWord(pAC,Addr,pVal)
#define VPD_IN16(pAC,IoC,Addr,pVal) (void)SkPciReadCfgWord(pAC,Addr,pVal)
#define VPD_IN32(pAC,IoC,Addr,pVal) (void)SkPciReadCfgDWord(pAC,Addr,pVal)
#define VPD_IN32(pAC,IoC,Addr,pVal) (void)SkPciReadCfgDWord(pAC,Addr,pVal)
#else
/* VPD_DO_IO */
#else
/* VPD_DO_IO */
#define VPD_OUT8(pAC,IoC,Addr,Val) SK_OUT8(IoC,PCI_C(Addr),Val)
#define VPD_OUT8(pAC,IoC,Addr,Val) SK_OUT8(IoC,PCI_C(Addr),Val)
#define VPD_OUT16(pAC,IoC,Addr,Val) SK_OUT16(IoC,PCI_C(Addr),Val)
#define VPD_OUT16(pAC,IoC,Addr,Val) SK_OUT16(IoC,PCI_C(Addr),Val)
#define VPD_OUT32(pAC,IoC,Addr,Val) SK_OUT32(IoC,PCI_C(Addr),Val)
#define VPD_IN8(pAC,IoC,Addr,pVal) SK_IN8(IoC,PCI_C(Addr),pVal)
#define VPD_IN8(pAC,IoC,Addr,pVal) SK_IN8(IoC,PCI_C(Addr),pVal)
#define VPD_IN16(pAC,IoC,Addr,pVal) SK_IN16(IoC,PCI_C(Addr),pVal)
#define VPD_IN16(pAC,IoC,Addr,pVal) SK_IN16(IoC,PCI_C(Addr),pVal)
#define VPD_IN32(pAC,IoC,Addr,pVal) SK_IN32(IoC,PCI_C(Addr),pVal)
#define VPD_IN32(pAC,IoC,Addr,pVal) SK_IN32(IoC,PCI_C(Addr),pVal)
...
@@ -155,12 +153,6 @@ typedef struct s_vpd_key {
...
@@ -155,12 +153,6 @@ typedef struct s_vpd_key {
else \
else \
SK_OUT16(pAC,PCI_C(Addr),Val); \
SK_OUT16(pAC,PCI_C(Addr),Val); \
}
}
#define VPD_OUT32(pAC,Ioc,Addr,Val) { \
if ((pAC)->DgT.DgUseCfgCycle) \
SkPciWriteCfgDWord(pAC,Addr,Val); \
else \
SK_OUT32(pAC,PCI_C(Addr),Val); \
}
#define VPD_IN8(pAC,Ioc,Addr,pVal) { \
#define VPD_IN8(pAC,Ioc,Addr,pVal) { \
if ((pAC)->DgT.DgUseCfgCycle) \
if ((pAC)->DgT.DgUseCfgCycle) \
SkPciReadCfgByte(pAC,Addr,pVal); \
SkPciReadCfgByte(pAC,Addr,pVal); \
...
...
drivers/net/sk98lin/skge.c
View file @
1f8fc993
...
@@ -277,6 +277,27 @@ extern struct ethtool_ops SkGeEthtoolOps;
...
@@ -277,6 +277,27 @@ extern struct ethtool_ops SkGeEthtoolOps;
static
uintptr_t
TxQueueAddr
[
SK_MAX_MACS
][
2
]
=
{{
0x680
,
0x600
},{
0x780
,
0x700
}};
static
uintptr_t
TxQueueAddr
[
SK_MAX_MACS
][
2
]
=
{{
0x680
,
0x600
},{
0x780
,
0x700
}};
static
uintptr_t
RxQueueAddr
[
SK_MAX_MACS
]
=
{
0x400
,
0x480
};
static
uintptr_t
RxQueueAddr
[
SK_MAX_MACS
]
=
{
0x400
,
0x480
};
/*****************************************************************************
*
* SkPciWriteCfgDWord - write a 32 bit value to pci config space
*
* Description:
* This routine writes a 32 bit value to the pci configuration
* space.
*
* Returns:
* 0 - indicate everything worked ok.
* != 0 - error indication
*/
static
inline
int
SkPciWriteCfgDWord
(
SK_AC
*
pAC
,
/* Adapter Control structure pointer */
int
PciAddr
,
/* PCI register address */
SK_U32
Val
)
/* pointer to store the read value */
{
pci_write_config_dword
(
pAC
->
PciDev
,
PciAddr
,
Val
);
return
(
0
);
}
/* SkPciWriteCfgDWord */
/*****************************************************************************
/*****************************************************************************
*
*
* SkGeInitPCI - Init the PCI resources
* SkGeInitPCI - Init the PCI resources
...
@@ -4083,28 +4104,6 @@ SK_U8 *pVal) /* pointer to store the read value */
...
@@ -4083,28 +4104,6 @@ SK_U8 *pVal) /* pointer to store the read value */
}
/* SkPciReadCfgByte */
}
/* SkPciReadCfgByte */
/*****************************************************************************
*
* SkPciWriteCfgDWord - write a 32 bit value to pci config space
*
* Description:
* This routine writes a 32 bit value to the pci configuration
* space.
*
* Returns:
* 0 - indicate everything worked ok.
* != 0 - error indication
*/
int
SkPciWriteCfgDWord
(
SK_AC
*
pAC
,
/* Adapter Control structure pointer */
int
PciAddr
,
/* PCI register address */
SK_U32
Val
)
/* pointer to store the read value */
{
pci_write_config_dword
(
pAC
->
PciDev
,
PciAddr
,
Val
);
return
(
0
);
}
/* SkPciWriteCfgDWord */
/*****************************************************************************
/*****************************************************************************
*
*
* SkPciWriteCfgWord - write a 16 bit value to pci config space
* SkPciWriteCfgWord - write a 16 bit value to pci config space
...
...
drivers/net/wan/lmc/lmc_prot.h
deleted
100644 → 0
View file @
638cbac8
#ifndef _LMC_PROTO_H_
#define _LMC_PROTO_H_
void
lmc_proto_init
(
lmc_softc_t
*
const
)
void
lmc_proto_attach
(
lmc_softc_t
*
sc
const
)
void
lmc_proto_detach
(
lmc_softc
*
sc
const
)
void
lmc_proto_reopen
(
lmc_softc_t
*
sc
const
)
int
lmc_proto_ioctl
(
lmc_softc_t
*
sc
const
,
struct
ifreq
*
ifr
,
int
cmd
)
void
lmc_proto_open
(
lmc_softc_t
*
sc
const
)
void
lmc_proto_close
(
lmc_softc_t
*
sc
const
)
unsigned
short
lmc_proto_type
(
lmc_softc_t
*
sc
const
,
struct
skbuff
*
skb
)
#endif
drivers/net/wireless/atmel.c
View file @
1f8fc993
This diff is collapsed.
Click to expand it.
drivers/net/wireless/hostap/Makefile
View file @
1f8fc993
hostap-y
:=
hostap_main.o
obj-$(CONFIG_HOSTAP)
+=
hostap.o
obj-$(CONFIG_HOSTAP)
+=
hostap.o
obj-$(CONFIG_HOSTAP_CS)
+=
hostap_cs.o
obj-$(CONFIG_HOSTAP_CS)
+=
hostap_cs.o
...
...
drivers/net/wireless/hostap/hostap.c
→
drivers/net/wireless/hostap/hostap
_main
.c
View file @
1f8fc993
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment