diff options
author | Jiri Pirko <jpirko@redhat.com> | 2010-02-17 07:27:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 18:59:48 -0500 |
commit | 0988d26978561d568efed45cc5576d85ea7b609d (patch) | |
tree | d6b658928b8ab50d81db521c1ea9547df9a9aec0 /drivers/net/cxgb3/cxgb3_main.c | |
parent | e4a474f82ddaaef65433b0b4f5169f2f6cd8ddb0 (diff) |
cxgb3: convert to use netdev_for_each_addr
Removed whole t3_rx_mode structure and appropriate helpers cause they are no
longer needed.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 73622f5312cb..6fd968abb073 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -324,11 +324,9 @@ void t3_os_phymod_changed(struct adapter *adap, int port_id) | |||
324 | 324 | ||
325 | static void cxgb_set_rxmode(struct net_device *dev) | 325 | static void cxgb_set_rxmode(struct net_device *dev) |
326 | { | 326 | { |
327 | struct t3_rx_mode rm; | ||
328 | struct port_info *pi = netdev_priv(dev); | 327 | struct port_info *pi = netdev_priv(dev); |
329 | 328 | ||
330 | init_rx_mode(&rm, dev, dev->mc_list); | 329 | t3_mac_set_rx_mode(&pi->mac, dev); |
331 | t3_mac_set_rx_mode(&pi->mac, &rm); | ||
332 | } | 330 | } |
333 | 331 | ||
334 | /** | 332 | /** |
@@ -339,17 +337,15 @@ static void cxgb_set_rxmode(struct net_device *dev) | |||
339 | */ | 337 | */ |
340 | static void link_start(struct net_device *dev) | 338 | static void link_start(struct net_device *dev) |
341 | { | 339 | { |
342 | struct t3_rx_mode rm; | ||
343 | struct port_info *pi = netdev_priv(dev); | 340 | struct port_info *pi = netdev_priv(dev); |
344 | struct cmac *mac = &pi->mac; | 341 | struct cmac *mac = &pi->mac; |
345 | 342 | ||
346 | init_rx_mode(&rm, dev, dev->mc_list); | ||
347 | t3_mac_reset(mac); | 343 | t3_mac_reset(mac); |
348 | t3_mac_set_num_ucast(mac, MAX_MAC_IDX); | 344 | t3_mac_set_num_ucast(mac, MAX_MAC_IDX); |
349 | t3_mac_set_mtu(mac, dev->mtu); | 345 | t3_mac_set_mtu(mac, dev->mtu); |
350 | t3_mac_set_address(mac, LAN_MAC_IDX, dev->dev_addr); | 346 | t3_mac_set_address(mac, LAN_MAC_IDX, dev->dev_addr); |
351 | t3_mac_set_address(mac, SAN_MAC_IDX, pi->iscsic.mac_addr); | 347 | t3_mac_set_address(mac, SAN_MAC_IDX, pi->iscsic.mac_addr); |
352 | t3_mac_set_rx_mode(mac, &rm); | 348 | t3_mac_set_rx_mode(mac, dev); |
353 | t3_link_start(&pi->phy, mac, &pi->link_config); | 349 | t3_link_start(&pi->phy, mac, &pi->link_config); |
354 | t3_mac_enable(mac, MAC_DIRECTION_RX | MAC_DIRECTION_TX); | 350 | t3_mac_enable(mac, MAC_DIRECTION_RX | MAC_DIRECTION_TX); |
355 | } | 351 | } |