netxen: fix link notification order

[~andy/linux] / drivers / net / ethernet / qlogic / netxen / netxen_nic_init.c

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
index 8694124ef77d256f73f52e9d01747c52776eb8f0..bc165f4d0f65cebb6cc82e3aa99590863963f767 100644 (file)
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_init.c
@@ -1437,8 +1437,6 @@ netxen_handle_linkevent(struct netxen_adapter *adapter, nx_fw_msg_t *msg)
                                netdev->name, cable_len);
        }
 
-       netxen_advert_link_change(adapter, link_status);
-
        /* update link parameters */
        if (duplex == LINKEVENT_FULL_DUPLEX)
                adapter->link_duplex = DUPLEX_FULL;
@@ -1447,6 +1445,8 @@ netxen_handle_linkevent(struct netxen_adapter *adapter, nx_fw_msg_t *msg)
        adapter->module_type = module;
        adapter->link_autoneg = autoneg;
        adapter->link_speed = link_speed;
+
+       netxen_advert_link_change(adapter, link_status);
 }
 
 static void
@@ -1532,8 +1532,6 @@ static struct sk_buff *netxen_process_rxbuf(struct netxen_adapter *adapter,
        } else
                skb->ip_summed = CHECKSUM_NONE;
 
-       skb->dev = adapter->netdev;
-
        buffer->skb = NULL;
 no_skb:
        buffer->state = NETXEN_BUFFER_FREE;