diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-04 08:36:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-04-04 08:36:01 -0700 |
| commit | b6d3d16e26da996d301aec0bbce5c26a0cdcf6ac (patch) | |
| tree | 752283d85dfe97329776e5a5493031ef17d795b5 /drivers/net/b44.c | |
| parent | 348e3fd19487534d9d4dd70c3ad0b751afd35792 (diff) | |
| parent | 1371fa6db0bbb8e23f988a641f5ae7361bc629dd (diff) | |
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:
r8169: fix suspend/resume for down interface
r8169: issue request_irq after the private data are completely initialized
b44: fix IFF_ALLMULTI handling of CAM slots
cxgb3 - Firwmare update
cxgb3 - Tighten xgmac workaround
cxgb3 - detect NIC only adapters
cxgb3 - Safeguard TCAM size usage
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index aaada572732..d742bfe2447 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c @@ -1709,7 +1709,7 @@ static void __b44_set_rx_mode(struct net_device *dev) bw32(bp, B44_RXCONFIG, val); } else { unsigned char zero[6] = {0, 0, 0, 0, 0, 0}; - int i = 0; + int i = 1; __b44_set_mac_addr(bp); |