Commit 8bae75ef authored by Jeff Garzik's avatar Jeff Garzik

Update 8139 net drivers for the following fixes:

* fix big endia multi-cast filtering
* fix 8139too ethtool media interface
parent 83ce24d8
...@@ -881,7 +881,7 @@ static void __cp_set_rx_mode (struct net_device *dev) ...@@ -881,7 +881,7 @@ static void __cp_set_rx_mode (struct net_device *dev)
i++, mclist = mclist->next) { i++, mclist = mclist->next) {
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31)); mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
rx_mode |= AcceptMulticast; rx_mode |= AcceptMulticast;
} }
} }
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
8139too.c: A RealTek RTL-8139 Fast Ethernet driver for Linux. 8139too.c: A RealTek RTL-8139 Fast Ethernet driver for Linux.
Maintained by Jeff Garzik <jgarzik@mandrakesoft.com> Maintained by Jeff Garzik <jgarzik@mandrakesoft.com>
Copyright 2000,2001 Jeff Garzik Copyright 2000-2002 Jeff Garzik
Much code comes from Donald Becker's rtl8139.c driver, Much code comes from Donald Becker's rtl8139.c driver,
versions 1.13 and older. This driver was originally based versions 1.13 and older. This driver was originally based
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
*/ */
#define DRV_NAME "8139too" #define DRV_NAME "8139too"
#define DRV_VERSION "0.9.24" #define DRV_VERSION "0.9.25"
#include <linux/config.h> #include <linux/config.h>
...@@ -1008,6 +1008,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev, ...@@ -1008,6 +1008,7 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
} else } else
#endif #endif
tp->phys[0] = 32; tp->phys[0] = 32;
tp->mii.phy_id = tp->phys[0];
/* The lower four bits are the media type. */ /* The lower four bits are the media type. */
option = (board_idx >= MAX_UNITS) ? 0 : media[board_idx]; option = (board_idx >= MAX_UNITS) ? 0 : media[board_idx];
...@@ -2427,7 +2428,7 @@ static void __set_rx_mode (struct net_device *dev) ...@@ -2427,7 +2428,7 @@ static void __set_rx_mode (struct net_device *dev)
i++, mclist = mclist->next) { i++, mclist = mclist->next) {
int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26; int bit_nr = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
mc_filter[bit_nr >> 5] |= cpu_to_le32(1 << (bit_nr & 31)); mc_filter[bit_nr >> 5] |= 1 << (bit_nr & 31);
rx_mode |= AcceptMulticast; rx_mode |= AcceptMulticast;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment