Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2c05004 authored by Ron Mercer's avatar Ron Mercer Committed by David S. Miller
Browse files

qlge: Restore promiscuous setting after reset. 



Signed-off-by: default avatarRon Mercer <ron.mercer@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4265e669

drivers/net/qlge/qlge.h

+1 −0
Original line number Diff line number Diff line
@@ -2246,6 +2246,7 @@ netdev_tx_t ql_lb_send(struct sk_buff *skb, struct net_device *ndev); 
void ql_check_lb_frame(struct ql_adapter *, struct sk_buff *);

int ql_own_firmware(struct ql_adapter *qdev);

int ql_clean_lb_rx_ring(struct rx_ring *rx_ring, int budget);

void qlge_set_multicast_list(struct net_device *ndev);



#if 1

#define QL_ALL_DUMP

drivers/net/qlge/qlge_main.c

+6 −1
Original line number Diff line number Diff line
@@ -3919,6 +3919,11 @@ static int ql_adapter_up(struct ql_adapter *qdev) 
	if ((ql_read32(qdev, STS) & qdev->port_init) &&

			(ql_read32(qdev, STS) & qdev->port_link_up))

		ql_link_on(qdev);

	/* Restore rx mode. */

	clear_bit(QL_ALLMULTI, &qdev->flags);

	clear_bit(QL_PROMISCUOUS, &qdev->flags);

	qlge_set_multicast_list(qdev->ndev);



	ql_enable_interrupts(qdev);

	ql_enable_all_completion_interrupts(qdev);

	netif_tx_start_all_queues(qdev->ndev);
@@ -4204,7 +4209,7 @@ static struct net_device_stats *qlge_get_stats(struct net_device 
	return &ndev->stats;

}



static void qlge_set_multicast_list(struct net_device *ndev)

void qlge_set_multicast_list(struct net_device *ndev)

{

	struct ql_adapter *qdev = (struct ql_adapter *)netdev_priv(ndev);

	struct netdev_hw_addr *ha;