diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 17:15:13 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-24 17:15:13 (GMT) |
| commit | a319a2773a13bab56a0d0b3744ba8703324313b5 (patch) | |
| tree | f02c86acabd1031439fd422a167784007e84ebb1 /drivers/net/82596.c | |
| parent | e18fa700c9a31360bc8f193aa543b7ef7b39a06b (diff) | |
| parent | 183798799216fad36c7219fe8d4d6dee6b8fa755 (diff) | |
| download | linux-fsl-qoriq-a319a2773a13bab56a0d0b3744ba8703324313b5.tar.xz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
net/ieee80211: fix more crypto-related build breakage
[PATCH] Spidernet: add ethtool -S (show statistics)
[NET] GT96100: Delete bitrotting ethernet driver
[PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
[PATCH] Cirrus Logic ep93xx ethernet driver
r8169: the MMIO region of the 8167 stands behin BAR#1
e1000, ixgb: Remove pointless wrappers
[PATCH] Remove powerpc specific parts of 3c509 driver
[PATCH] s2io: Switch to pci_get_device
[PATCH] gt96100: move to pci_get_device API
[PATCH] ehea: bugfix for register access functions
[PATCH] e1000 disable device on PCI error
drivers/net/phy/fixed: #if 0 some incomplete code
drivers/net: const-ify ethtool_ops declarations
[PATCH] ethtool: allow const ethtool_ops
[PATCH] sky2: big endian
[PATCH] sky2: fiber support
[PATCH] sky2: tx pause bug fix
drivers/net: Trim trailing whitespace
[PATCH] ehea: IBM eHEA Ethernet Device Driver
...
Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.
Diffstat (limited to 'drivers/net/82596.c')
| -rw-r--r-- | drivers/net/82596.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index 257d3bc..c9e4dca 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c @@ -444,7 +444,7 @@ static inline int wait_cmd(struct net_device *dev, struct i596_private *lp, int static inline int wait_cfg(struct net_device *dev, struct i596_cmd *cmd, int delcnt, char *str) { volatile struct i596_cmd *c = cmd; - + while (--delcnt && c->command) udelay(10); if (!delcnt) { @@ -455,7 +455,7 @@ static inline int wait_cfg(struct net_device *dev, struct i596_cmd *cmd, int del return 0; } - + static void i596_display_data(struct net_device *dev) { struct i596_private *lp = dev->priv; @@ -787,7 +787,7 @@ static inline int i596_rx(struct net_device *dev) } DEB(DEB_RXFRAME, printk(KERN_DEBUG " rfd %p, rfd.rbd %p, rfd.stat %04x\n", rfd, rfd->rbd, rfd->stat)); - + if (rbd != I596_NULL && ((rfd->stat) & STAT_OK)) { /* a good frame */ int pkt_len = rbd->count & 0x3fff; @@ -1208,7 +1208,7 @@ struct net_device * __init i82596_probe(int unit) Some other boards trip the checksum.. but then appear as ether address 0. Trap these - AC */ - if ((checksum % 0x100) || + if ((checksum % 0x100) || (memcmp(eth_addr, "\x00\x00\x49", 3) != 0)) { err = -ENODEV; goto out1; @@ -1545,7 +1545,7 @@ static void set_multicast_list(struct net_device *dev) printk(KERN_ERR "%s: Only %d multicast addresses supported", dev->name, cnt); } - + if (dev->mc_count > 0) { struct dev_mc_list *dmi; unsigned char *cp; @@ -1609,7 +1609,7 @@ void __exit cleanup_module(void) } #endif /* MODULE */ - + /* * Local variables: * compile-command: "gcc -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -m486 -c 82596.c" |