git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
8139too.c
diff --git
a/drivers/net/8139too.c
b/drivers/net/8139too.c
index
feae783
..
2beac55
100644
(file)
--- a/
drivers/net/8139too.c
+++ b/
drivers/net/8139too.c
@@
-229,7
+229,7
@@
typedef enum {
/* indexed by board_t, above */
/* indexed by board_t, above */
-static
const
struct {
+static struct {
const char *name;
u32 hw_flags;
} board_info[] __devinitdata = {
const char *name;
u32 hw_flags;
} board_info[] __devinitdata = {
@@
-1131,7
+1131,7
@@
static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
*/
No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
*/
-#define eeprom_delay()
(void)
RTL_R32(Cfg9346)
+#define eeprom_delay() RTL_R32(Cfg9346)
/* The EEPROM commands include the alway-set leading bit. */
#define EE_WRITE_CMD (5)
/* The EEPROM commands include the alway-set leading bit. */
#define EE_WRITE_CMD (5)
@@
-1192,7
+1192,7
@@
static int __devinit read_eeprom (void __iomem *ioaddr, int location, int addr_l
#define mdio_delay() RTL_R8(Config4)
#define mdio_delay() RTL_R8(Config4)
-static c
onst c
har mii_2_8139_map[8] = {
+static char mii_2_8139_map[8] = {
BasicModeCtrl,
BasicModeStatus,
0,
BasicModeCtrl,
BasicModeStatus,
0,
@@
-1605,7
+1605,7
@@
static void rtl8139_thread (void *_data)
if (tp->watchdog_fired) {
tp->watchdog_fired = 0;
rtl8139_tx_timeout_task(_data);
if (tp->watchdog_fired) {
tp->watchdog_fired = 0;
rtl8139_tx_timeout_task(_data);
- } else if (rtnl_
trylock()
) {
+ } else if (rtnl_
shlock_nowait() == 0
) {
rtl8139_thread_iter (dev, tp, tp->mmio_addr);
rtnl_unlock ();
} else {
rtl8139_thread_iter (dev, tp, tp->mmio_addr);
rtnl_unlock ();
} else {