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
10badc21
Commit
10badc21
authored
Apr 12, 2006
by
Jeff Garzik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[netdrvr b44] trim trailing whitespace
parent
8056bfaf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
19 deletions
+19
-19
drivers/net/b44.c
drivers/net/b44.c
+19
-19
No files found.
drivers/net/b44.c
View file @
10badc21
...
@@ -137,7 +137,7 @@ static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
...
@@ -137,7 +137,7 @@ static inline unsigned long br32(const struct b44 *bp, unsigned long reg)
return
readl
(
bp
->
regs
+
reg
);
return
readl
(
bp
->
regs
+
reg
);
}
}
static
inline
void
bw32
(
const
struct
b44
*
bp
,
static
inline
void
bw32
(
const
struct
b44
*
bp
,
unsigned
long
reg
,
unsigned
long
val
)
unsigned
long
reg
,
unsigned
long
val
)
{
{
writel
(
val
,
bp
->
regs
+
reg
);
writel
(
val
,
bp
->
regs
+
reg
);
...
@@ -287,13 +287,13 @@ static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
...
@@ -287,13 +287,13 @@ static void __b44_cam_write(struct b44 *bp, unsigned char *data, int index)
val
|=
((
u32
)
data
[
4
])
<<
8
;
val
|=
((
u32
)
data
[
4
])
<<
8
;
val
|=
((
u32
)
data
[
5
])
<<
0
;
val
|=
((
u32
)
data
[
5
])
<<
0
;
bw32
(
bp
,
B44_CAM_DATA_LO
,
val
);
bw32
(
bp
,
B44_CAM_DATA_LO
,
val
);
val
=
(
CAM_DATA_HI_VALID
|
val
=
(
CAM_DATA_HI_VALID
|
(((
u32
)
data
[
0
])
<<
8
)
|
(((
u32
)
data
[
0
])
<<
8
)
|
(((
u32
)
data
[
1
])
<<
0
));
(((
u32
)
data
[
1
])
<<
0
));
bw32
(
bp
,
B44_CAM_DATA_HI
,
val
);
bw32
(
bp
,
B44_CAM_DATA_HI
,
val
);
bw32
(
bp
,
B44_CAM_CTRL
,
(
CAM_CTRL_WRITE
|
bw32
(
bp
,
B44_CAM_CTRL
,
(
CAM_CTRL_WRITE
|
(
index
<<
CAM_CTRL_INDEX_SHIFT
)));
(
index
<<
CAM_CTRL_INDEX_SHIFT
)));
b44_wait_bit
(
bp
,
B44_CAM_CTRL
,
CAM_CTRL_BUSY
,
100
,
1
);
b44_wait_bit
(
bp
,
B44_CAM_CTRL
,
CAM_CTRL_BUSY
,
100
,
1
);
}
}
static
inline
void
__b44_disable_ints
(
struct
b44
*
bp
)
static
inline
void
__b44_disable_ints
(
struct
b44
*
bp
)
...
@@ -411,15 +411,15 @@ static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
...
@@ -411,15 +411,15 @@ static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
static
void
b44_set_flow_ctrl
(
struct
b44
*
bp
,
u32
local
,
u32
remote
)
static
void
b44_set_flow_ctrl
(
struct
b44
*
bp
,
u32
local
,
u32
remote
)
{
{
u32
pause_enab
=
0
;
u32
pause_enab
=
0
;
/* The driver supports only rx pause by default because
/* The driver supports only rx pause by default because
the b44 mac tx pause mechanism generates excessive
the b44 mac tx pause mechanism generates excessive
pause frames.
pause frames.
Use ethtool to turn on b44 tx pause if necessary.
Use ethtool to turn on b44 tx pause if necessary.
*/
*/
if
((
local
&
ADVERTISE_PAUSE_CAP
)
&&
if
((
local
&
ADVERTISE_PAUSE_CAP
)
&&
(
local
&
ADVERTISE_PAUSE_ASYM
)){
(
local
&
ADVERTISE_PAUSE_ASYM
)){
if
((
remote
&
LPA_PAUSE_ASYM
)
&&
if
((
remote
&
LPA_PAUSE_ASYM
)
&&
!
(
remote
&
LPA_PAUSE_CAP
))
!
(
remote
&
LPA_PAUSE_CAP
))
pause_enab
|=
B44_FLAG_RX_PAUSE
;
pause_enab
|=
B44_FLAG_RX_PAUSE
;
...
@@ -1057,7 +1057,7 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu)
...
@@ -1057,7 +1057,7 @@ static int b44_change_mtu(struct net_device *dev, int new_mtu)
spin_unlock_irq
(
&
bp
->
lock
);
spin_unlock_irq
(
&
bp
->
lock
);
b44_enable_ints
(
bp
);
b44_enable_ints
(
bp
);
return
0
;
return
0
;
}
}
...
@@ -1375,7 +1375,7 @@ static void b44_init_hw(struct b44 *bp)
...
@@ -1375,7 +1375,7 @@ static void b44_init_hw(struct b44 *bp)
bw32
(
bp
,
B44_DMARX_ADDR
,
bp
->
rx_ring_dma
+
bp
->
dma_offset
);
bw32
(
bp
,
B44_DMARX_ADDR
,
bp
->
rx_ring_dma
+
bp
->
dma_offset
);
bw32
(
bp
,
B44_DMARX_PTR
,
bp
->
rx_pending
);
bw32
(
bp
,
B44_DMARX_PTR
,
bp
->
rx_pending
);
bp
->
rx_prod
=
bp
->
rx_pending
;
bp
->
rx_prod
=
bp
->
rx_pending
;
bw32
(
bp
,
B44_MIB_CTRL
,
MIB_CTRL_CLR_ON_READ
);
bw32
(
bp
,
B44_MIB_CTRL
,
MIB_CTRL_CLR_ON_READ
);
...
@@ -1547,9 +1547,9 @@ static void __b44_set_rx_mode(struct net_device *dev)
...
@@ -1547,9 +1547,9 @@ static void __b44_set_rx_mode(struct net_device *dev)
val
|=
RXCONFIG_ALLMULTI
;
val
|=
RXCONFIG_ALLMULTI
;
else
else
i
=
__b44_load_mcast
(
bp
,
dev
);
i
=
__b44_load_mcast
(
bp
,
dev
);
for
(;
i
<
64
;
i
++
)
{
for
(;
i
<
64
;
i
++
)
{
__b44_cam_write
(
bp
,
zero
,
i
);
__b44_cam_write
(
bp
,
zero
,
i
);
}
}
bw32
(
bp
,
B44_RXCONFIG
,
val
);
bw32
(
bp
,
B44_RXCONFIG
,
val
);
val
=
br32
(
bp
,
B44_CAM_CTRL
);
val
=
br32
(
bp
,
B44_CAM_CTRL
);
...
@@ -1731,7 +1731,7 @@ static int b44_set_ringparam(struct net_device *dev,
...
@@ -1731,7 +1731,7 @@ static int b44_set_ringparam(struct net_device *dev,
spin_unlock_irq
(
&
bp
->
lock
);
spin_unlock_irq
(
&
bp
->
lock
);
b44_enable_ints
(
bp
);
b44_enable_ints
(
bp
);
return
0
;
return
0
;
}
}
...
@@ -1776,7 +1776,7 @@ static int b44_set_pauseparam(struct net_device *dev,
...
@@ -1776,7 +1776,7 @@ static int b44_set_pauseparam(struct net_device *dev,
spin_unlock_irq
(
&
bp
->
lock
);
spin_unlock_irq
(
&
bp
->
lock
);
b44_enable_ints
(
bp
);
b44_enable_ints
(
bp
);
return
0
;
return
0
;
}
}
...
@@ -1892,7 +1892,7 @@ static int __devinit b44_get_invariants(struct b44 *bp)
...
@@ -1892,7 +1892,7 @@ static int __devinit b44_get_invariants(struct b44 *bp)
bp
->
core_unit
=
ssb_core_unit
(
bp
);
bp
->
core_unit
=
ssb_core_unit
(
bp
);
bp
->
dma_offset
=
SB_PCI_DMA
;
bp
->
dma_offset
=
SB_PCI_DMA
;
/* XXX - really required?
/* XXX - really required?
bp->flags |= B44_FLAG_BUGGY_TXPTR;
bp->flags |= B44_FLAG_BUGGY_TXPTR;
*/
*/
out:
out:
...
@@ -1940,7 +1940,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
...
@@ -1940,7 +1940,7 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
"aborting.
\n
"
);
"aborting.
\n
"
);
goto
err_out_free_res
;
goto
err_out_free_res
;
}
}
err
=
pci_set_consistent_dma_mask
(
pdev
,
(
u64
)
B44_DMA_MASK
);
err
=
pci_set_consistent_dma_mask
(
pdev
,
(
u64
)
B44_DMA_MASK
);
if
(
err
)
{
if
(
err
)
{
printk
(
KERN_ERR
PFX
"No usable DMA configuration, "
printk
(
KERN_ERR
PFX
"No usable DMA configuration, "
...
@@ -2035,9 +2035,9 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
...
@@ -2035,9 +2035,9 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
pci_save_state
(
bp
->
pdev
);
pci_save_state
(
bp
->
pdev
);
/* Chip reset provides power to the b44 MAC & PCI cores, which
/* Chip reset provides power to the b44 MAC & PCI cores, which
* is necessary for MAC register access.
* is necessary for MAC register access.
*/
*/
b44_chip_reset
(
bp
);
b44_chip_reset
(
bp
);
printk
(
KERN_INFO
"%s: Broadcom 4400 10/100BaseT Ethernet "
,
dev
->
name
);
printk
(
KERN_INFO
"%s: Broadcom 4400 10/100BaseT Ethernet "
,
dev
->
name
);
...
@@ -2085,10 +2085,10 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
...
@@ -2085,10 +2085,10 @@ static int b44_suspend(struct pci_dev *pdev, pm_message_t state)
del_timer_sync
(
&
bp
->
timer
);
del_timer_sync
(
&
bp
->
timer
);
spin_lock_irq
(
&
bp
->
lock
);
spin_lock_irq
(
&
bp
->
lock
);
b44_halt
(
bp
);
b44_halt
(
bp
);
netif_carrier_off
(
bp
->
dev
);
netif_carrier_off
(
bp
->
dev
);
netif_device_detach
(
bp
->
dev
);
netif_device_detach
(
bp
->
dev
);
b44_free_rings
(
bp
);
b44_free_rings
(
bp
);
...
...
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