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
Kirill Smelkov
linux
Commits
3744100e
Commit
3744100e
authored
Jun 17, 2011
by
Francois Romieu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
r8169: fix static initializers.
Signed-off-by:
Francois Romieu
<
romieu@fr.zoreil.com
>
parent
eeb14972
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
4 deletions
+6
-4
drivers/net/r8169.c
drivers/net/r8169.c
+6
-4
No files found.
drivers/net/r8169.c
View file @
3744100e
...
@@ -1621,7 +1621,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
...
@@ -1621,7 +1621,7 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
*
*
* (RTL_R32(TxConfig) & 0x700000) == 0x200000 ? 8101Eb : 8101Ec
* (RTL_R32(TxConfig) & 0x700000) == 0x200000 ? 8101Eb : 8101Ec
*/
*/
static
const
struct
{
static
const
struct
rtl_mac_info
{
u32
mask
;
u32
mask
;
u32
val
;
u32
val
;
int
mac_version
;
int
mac_version
;
...
@@ -1689,7 +1689,8 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
...
@@ -1689,7 +1689,8 @@ static void rtl8169_get_mac_version(struct rtl8169_private *tp,
/* Catch-all */
/* Catch-all */
{
0x00000000
,
0x00000000
,
RTL_GIGA_MAC_NONE
}
{
0x00000000
,
0x00000000
,
RTL_GIGA_MAC_NONE
}
},
*
p
=
mac_info
;
};
const
struct
rtl_mac_info
*
p
=
mac_info
;
u32
reg
;
u32
reg
;
reg
=
RTL_R32
(
TxConfig
);
reg
=
RTL_R32
(
TxConfig
);
...
@@ -3681,7 +3682,7 @@ static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz)
...
@@ -3681,7 +3682,7 @@ static void rtl_set_rx_max_size(void __iomem *ioaddr, unsigned int rx_buf_sz)
static
void
rtl8169_set_magic_reg
(
void
__iomem
*
ioaddr
,
unsigned
mac_version
)
static
void
rtl8169_set_magic_reg
(
void
__iomem
*
ioaddr
,
unsigned
mac_version
)
{
{
static
const
struct
{
static
const
struct
rtl_cfg2_info
{
u32
mac_version
;
u32
mac_version
;
u32
clk
;
u32
clk
;
u32
val
;
u32
val
;
...
@@ -3690,7 +3691,8 @@ static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
...
@@ -3690,7 +3691,8 @@ static void rtl8169_set_magic_reg(void __iomem *ioaddr, unsigned mac_version)
{
RTL_GIGA_MAC_VER_05
,
PCI_Clock_66MHz
,
0x000fffff
},
{
RTL_GIGA_MAC_VER_05
,
PCI_Clock_66MHz
,
0x000fffff
},
{
RTL_GIGA_MAC_VER_06
,
PCI_Clock_33MHz
,
0x00ffff00
},
// 8110SCe
{
RTL_GIGA_MAC_VER_06
,
PCI_Clock_33MHz
,
0x00ffff00
},
// 8110SCe
{
RTL_GIGA_MAC_VER_06
,
PCI_Clock_66MHz
,
0x00ffffff
}
{
RTL_GIGA_MAC_VER_06
,
PCI_Clock_66MHz
,
0x00ffffff
}
},
*
p
=
cfg2_info
;
};
const
struct
rtl_cfg2_info
*
p
=
cfg2_info
;
unsigned
int
i
;
unsigned
int
i
;
u32
clk
;
u32
clk
;
...
...
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