git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] sky2: fix ram buffer for Yukon FE rev 2
[safe/jmp/linux-2.6]
/
drivers
/
net
/
r8169.c
diff --git
a/drivers/net/r8169.c
b/drivers/net/r8169.c
index
40c40eb
..
2e1bed1
100644
(file)
--- a/
drivers/net/r8169.c
+++ b/
drivers/net/r8169.c
@@
-92,8
+92,7
@@
VERSION 2.2LK <2005/01/25>
#endif /* RTL8169_DEBUG */
#define R8169_MSG_DEFAULT \
#endif /* RTL8169_DEBUG */
#define R8169_MSG_DEFAULT \
- (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_LINK | NETIF_MSG_IFUP | \
- NETIF_MSG_IFDOWN)
+ (NETIF_MSG_DRV | NETIF_MSG_PROBE | NETIF_MSG_IFUP | NETIF_MSG_IFDOWN)
#define TX_BUFFS_AVAIL(tp) \
(tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)
#define TX_BUFFS_AVAIL(tp) \
(tp->dirty_tx + NUM_TX_DESC - tp->cur_tx - 1)
@@
-171,7
+170,7
@@
enum phy_version {
#define _R(NAME,MAC,MASK) \
{ .name = NAME, .mac_version = MAC, .RxConfigMask = MASK }
#define _R(NAME,MAC,MASK) \
{ .name = NAME, .mac_version = MAC, .RxConfigMask = MASK }
-
const static
struct {
+
static const
struct {
const char *name;
u8 mac_version;
u32 RxConfigMask; /* Clears the bits supported by this chip */
const char *name;
u8 mac_version;
u32 RxConfigMask; /* Clears the bits supported by this chip */
@@
-1347,10
+1346,8
@@
rtl8169_init_board(struct pci_dev *pdev, struct net_device **dev_out,
} else {
if (netif_msg_probe(tp)) {
printk(KERN_ERR PFX
} else {
if (netif_msg_probe(tp)) {
printk(KERN_ERR PFX
- "Cannot find PowerManagement capability. "
- "Aborting.\n");
+ "PowerManagement capability not found.\n");
}
}
- goto err_out_mwi;
}
/* make sure PCI base addr 1 is MMIO */
}
/* make sure PCI base addr 1 is MMIO */
@@
-2517,7
+2514,7
@@
rtl8169_interrupt(int irq, void *dev_instance, struct pt_regs *regs)
} while (boguscnt > 0);
if (boguscnt <= 0) {
} while (boguscnt > 0);
if (boguscnt <= 0) {
- if (net
_ratelimit() && netif_msg_intr(tp)
) {
+ if (net
if_msg_intr(tp) && net_ratelimit()
) {
printk(KERN_WARNING
"%s: Too much work at interrupt!\n", dev->name);
}
printk(KERN_WARNING
"%s: Too much work at interrupt!\n", dev->name);
}