diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-01 00:09:40 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-01 00:09:40 -0700 |
| commit | 1b4c8af8d2e9bfb474f233b010988ec008ae2ffa (patch) | |
| tree | 0ad6960be1e7775fc6de95337ae08c07124bed8e /drivers/net | |
| parent | 3da3f872aa175f59e20766ed30aaea67fd4fa7d1 (diff) | |
| parent | 384b90abeba71579e0601ff434e3ea40c15057f0 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/r8169.c | 1 | ||||
| -rw-r--r-- | drivers/net/sis190.c | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index 7d9c650f395..c77286edba4 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -239,6 +239,7 @@ static DEFINE_PCI_DEVICE_TABLE(rtl8169_pci_tbl) = { { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8168), 0, 0, RTL_CFG_1 }, { PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8169), 0, 0, RTL_CFG_0 }, { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4300), 0, 0, RTL_CFG_0 }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4302), 0, 0, RTL_CFG_0 }, { PCI_DEVICE(PCI_VENDOR_ID_AT, 0xc107), 0, 0, RTL_CFG_0 }, { PCI_DEVICE(0x16ec, 0x0116), 0, 0, RTL_CFG_0 }, { PCI_VENDOR_ID_LINKSYS, 0x1032, diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 8ad7bfbaa3a..3c0f1312b39 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c @@ -1825,6 +1825,16 @@ static int sis190_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) generic_mii_ioctl(&tp->mii_if, if_mii(ifr), cmd, NULL); } +static int sis190_mac_addr(struct net_device *dev, void *p) +{ + int rc; + + rc = eth_mac_addr(dev, p); + if (!rc) + sis190_init_rxfilter(dev); + return rc; +} + static const struct net_device_ops sis190_netdev_ops = { .ndo_open = sis190_open, .ndo_stop = sis190_close, @@ -1833,7 +1843,7 @@ static const struct net_device_ops sis190_netdev_ops = { .ndo_tx_timeout = sis190_tx_timeout, .ndo_set_multicast_list = sis190_set_rx_mode, .ndo_change_mtu = eth_change_mtu, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = sis190_mac_addr, .ndo_validate_addr = eth_validate_addr, #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = sis190_netpoll, |