From 3f34b0c9139c68ba941c8a8c9c01340607327d07 Mon Sep 17 00:00:00 2001 From: Klement Fish Date: Thu, 28 Jul 2011 06:03:22 +0000 Subject: [PATCH] --- yaml --- r: 262437 b: refs/heads/master c: fe66101f14813b77d84f6450d51772a2af2b81a1 h: refs/heads/master i: 262435: aa815864b90bfa9b4770bbbfebb9547f7852a843 v: v3 --- [refs] | 2 +- trunk/drivers/net/sis190.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7c281af51491..80215d9e8d7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4203223a1aed862b4445fdcd260d6139603a51d9 +refs/heads/master: fe66101f14813b77d84f6450d51772a2af2b81a1 diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c index 8ad7bfbaa3af..3c0f1312b391 100644 --- a/trunk/drivers/net/sis190.c +++ b/trunk/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,