diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-28 15:49:40 -0500 |
commit | 0191b625ca5a46206d2fb862bb08f36f2fcb3b31 (patch) | |
tree | 454d1842b1833d976da62abcbd5c47521ebe9bd7 /drivers/net/tulip/tulip_core.c | |
parent | 54a696bd07c14d3b1192d03ce7269bc59b45209a (diff) | |
parent | eb56092fc168bf5af199d47af50c0d84a96db898 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
net: Allow dependancies of FDDI & Tokenring to be modular.
igb: Fix build warning when DCA is disabled.
net: Fix warning fallout from recent NAPI interface changes.
gro: Fix potential use after free
sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
sfc: When disabling the NIC, close the device rather than unregistering it
sfc: SFT9001: Add cable diagnostics
sfc: Add support for multiple PHY self-tests
sfc: Merge top-level functions for self-tests
sfc: Clean up PHY mode management in loopback self-test
sfc: Fix unreliable link detection in some loopback modes
sfc: Generate unique names for per-NIC workqueues
802.3ad: use standard ethhdr instead of ad_header
802.3ad: generalize out mac address initializer
802.3ad: initialize ports LACPDU from const initializer
802.3ad: remove typedef around ad_system
802.3ad: turn ports is_individual into a bool
802.3ad: turn ports is_enabled into a bool
802.3ad: make ntt bool
ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
...
Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).
Diffstat (limited to 'drivers/net/tulip/tulip_core.c')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index cafa89e60167..ff84babb3ff3 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1050,13 +1050,11 @@ static void set_rx_mode(struct net_device *dev) | |||
1050 | filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; | 1050 | filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; |
1051 | filterbit &= 0x3f; | 1051 | filterbit &= 0x3f; |
1052 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); | 1052 | mc_filter[filterbit >> 5] |= 1 << (filterbit & 31); |
1053 | if (tulip_debug > 2) { | 1053 | if (tulip_debug > 2) |
1054 | DECLARE_MAC_BUF(mac); | 1054 | printk(KERN_INFO "%s: Added filter for %pM" |
1055 | printk(KERN_INFO "%s: Added filter for %s" | ||
1056 | " %8.8x bit %d.\n", | 1055 | " %8.8x bit %d.\n", |
1057 | dev->name, print_mac(mac, mclist->dmi_addr), | 1056 | dev->name, mclist->dmi_addr, |
1058 | ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit); | 1057 | ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit); |
1059 | } | ||
1060 | } | 1058 | } |
1061 | if (mc_filter[0] == tp->mc_filter[0] && | 1059 | if (mc_filter[0] == tp->mc_filter[0] && |
1062 | mc_filter[1] == tp->mc_filter[1]) | 1060 | mc_filter[1] == tp->mc_filter[1]) |
@@ -1250,7 +1248,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1250 | const char *chip_name = tulip_tbl[chip_idx].chip_name; | 1248 | const char *chip_name = tulip_tbl[chip_idx].chip_name; |
1251 | unsigned int eeprom_missing = 0; | 1249 | unsigned int eeprom_missing = 0; |
1252 | unsigned int force_csr0 = 0; | 1250 | unsigned int force_csr0 = 0; |
1253 | DECLARE_MAC_BUF(mac); | ||
1254 | 1251 | ||
1255 | #ifndef MODULE | 1252 | #ifndef MODULE |
1256 | static int did_version; /* Already printed version info. */ | 1253 | static int did_version; /* Already printed version info. */ |
@@ -1432,9 +1429,9 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1432 | for (i = 0; i < 3; i++) { | 1429 | for (i = 0; i < 3; i++) { |
1433 | int value, boguscnt = 100000; | 1430 | int value, boguscnt = 100000; |
1434 | iowrite32(0x600 | i, ioaddr + 0x98); | 1431 | iowrite32(0x600 | i, ioaddr + 0x98); |
1435 | do | 1432 | do { |
1436 | value = ioread32(ioaddr + CSR9); | 1433 | value = ioread32(ioaddr + CSR9); |
1437 | while (value < 0 && --boguscnt > 0); | 1434 | } while (value < 0 && --boguscnt > 0); |
1438 | put_unaligned_le16(value, ((__le16 *)dev->dev_addr) + i); | 1435 | put_unaligned_le16(value, ((__le16 *)dev->dev_addr) + i); |
1439 | sum += value & 0xffff; | 1436 | sum += value & 0xffff; |
1440 | } | 1437 | } |
@@ -1635,7 +1632,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1635 | 1632 | ||
1636 | if (eeprom_missing) | 1633 | if (eeprom_missing) |
1637 | printk(" EEPROM not present,"); | 1634 | printk(" EEPROM not present,"); |
1638 | printk(" %s", print_mac(mac, dev->dev_addr)); | 1635 | printk(" %pM", dev->dev_addr); |
1639 | printk(", IRQ %d.\n", irq); | 1636 | printk(", IRQ %d.\n", irq); |
1640 | 1637 | ||
1641 | if (tp->chip_id == PNIC2) | 1638 | if (tp->chip_id == PNIC2) |