Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Side by Side Diff: chromeos/compat-wireless/drivers/net/atlx/atl1.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Fixes for !ACK handling, missing local changes, log message fixes Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved. 2 * Copyright(c) 2005 - 2006 Attansic Corporation. All rights reserved.
3 * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com> 3 * Copyright(c) 2006 - 2007 Chris Snook <csnook@redhat.com>
4 * Copyright(c) 2006 - 2008 Jay Cliburn <jcliburn@gmail.com> 4 * Copyright(c) 2006 - 2008 Jay Cliburn <jcliburn@gmail.com>
5 * 5 *
6 * Derived from Intel e1000 driver 6 * Derived from Intel e1000 driver
7 * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved. 7 * Copyright(c) 1999 - 2005 Intel Corporation. All rights reserved.
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify it 9 * This program is free software; you can redistribute it and/or modify it
10 * under the terms of the GNU General Public License as published by the Free 10 * under the terms of the GNU General Public License as published by the Free
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 tpd_ring->buffer_info = NULL; 1244 tpd_ring->buffer_info = NULL;
1245 tpd_ring->desc = NULL; 1245 tpd_ring->desc = NULL;
1246 tpd_ring->dma = 0; 1246 tpd_ring->dma = 0;
1247 1247
1248 rfd_ring->buffer_info = NULL; 1248 rfd_ring->buffer_info = NULL;
1249 rfd_ring->desc = NULL; 1249 rfd_ring->desc = NULL;
1250 rfd_ring->dma = 0; 1250 rfd_ring->dma = 0;
1251 1251
1252 rrd_ring->desc = NULL; 1252 rrd_ring->desc = NULL;
1253 rrd_ring->dma = 0; 1253 rrd_ring->dma = 0;
1254
1255 adapter->cmb.dma = 0;
1256 adapter->cmb.cmb = NULL;
1257
1258 adapter->smb.dma = 0;
1259 adapter->smb.smb = NULL;
1254 } 1260 }
1255 1261
1256 static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter) 1262 static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter)
1257 { 1263 {
1258 u32 value; 1264 u32 value;
1259 struct atl1_hw *hw = &adapter->hw; 1265 struct atl1_hw *hw = &adapter->hw;
1260 struct net_device *netdev = adapter->netdev; 1266 struct net_device *netdev = adapter->netdev;
1261 /* Config MAC CTRL Register */ 1267 /* Config MAC CTRL Register */
1262 value = MAC_CTRL_TX_EN | MAC_CTRL_RX_EN; 1268 value = MAC_CTRL_TX_EN | MAC_CTRL_RX_EN;
1263 /* duplex */ 1269 /* duplex */
(...skipping 1576 matching lines...) Expand 10 before | Expand all | Expand 10 after
2840 "error enabling pci device\n"); 2846 "error enabling pci device\n");
2841 return err; 2847 return err;
2842 } 2848 }
2843 2849
2844 pci_set_master(pdev); 2850 pci_set_master(pdev);
2845 iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL); 2851 iowrite32(0, adapter->hw.hw_addr + REG_WOL_CTRL);
2846 pci_enable_wake(pdev, PCI_D3hot, 0); 2852 pci_enable_wake(pdev, PCI_D3hot, 0);
2847 pci_enable_wake(pdev, PCI_D3cold, 0); 2853 pci_enable_wake(pdev, PCI_D3cold, 0);
2848 2854
2849 atl1_reset_hw(&adapter->hw); 2855 atl1_reset_hw(&adapter->hw);
2850 adapter->cmb.cmb->int_stats = 0;
2851 2856
2852 » if (netif_running(netdev)) 2857 » if (netif_running(netdev)) {
2858 » » adapter->cmb.cmb->int_stats = 0;
2853 atl1_up(adapter); 2859 atl1_up(adapter);
2860 }
2854 netif_device_attach(netdev); 2861 netif_device_attach(netdev);
2855 2862
2856 return 0; 2863 return 0;
2857 } 2864 }
2858 #else 2865 #else
2859 #define atl1_suspend NULL 2866 #define atl1_suspend NULL
2860 #define atl1_resume NULL 2867 #define atl1_resume NULL
2861 #endif 2868 #endif
2862 2869
2863 static void atl1_shutdown(struct pci_dev *pdev) 2870 static void atl1_shutdown(struct pci_dev *pdev)
(...skipping 804 matching lines...) Expand 10 before | Expand all | Expand 10 after
3668 .get_rx_csum = atl1_get_rx_csum, 3675 .get_rx_csum = atl1_get_rx_csum,
3669 .set_tx_csum = ethtool_op_set_tx_hw_csum, 3676 .set_tx_csum = ethtool_op_set_tx_hw_csum,
3670 .get_link = ethtool_op_get_link, 3677 .get_link = ethtool_op_get_link,
3671 .set_sg = ethtool_op_set_sg, 3678 .set_sg = ethtool_op_set_sg,
3672 .get_strings = atl1_get_strings, 3679 .get_strings = atl1_get_strings,
3673 .nway_reset = atl1_nway_reset, 3680 .nway_reset = atl1_nway_reset,
3674 .get_ethtool_stats = atl1_get_ethtool_stats, 3681 .get_ethtool_stats = atl1_get_ethtool_stats,
3675 .get_sset_count = atl1_get_sset_count, 3682 .get_sset_count = atl1_get_sset_count,
3676 .set_tso = ethtool_op_set_tso, 3683 .set_tso = ethtool_op_set_tso,
3677 }; 3684 };
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698