Skip to content

Commit a2724f2

Browse files
torvaldstorvalds
committed
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (47 commits) tcp: Fix >4GB writes on 64-bit. net/9p: Mount only matching virtio channels de2104x: fix ethtool tproxy: check for transparent flag in ip_route_newports ipv6: add IPv6 to neighbour table overflow warning tcp: fix TSO FACK loss marking in tcp_mark_head_lost 3c59x: fix regression from patch "Add ethtool WOL support" ipv6: add a missing unregister_pernet_subsys call s390: use free_netdev(netdev) instead of kfree() sgiseeq: use free_netdev(netdev) instead of kfree() rionet: use free_netdev(netdev) instead of kfree() ibm_newemac: use free_netdev(netdev) instead of kfree() smsc911x: Add MODULE_ALIAS() net: reset skb queue mapping when rx'ing over tunnel br2684: fix scheduling while atomic de2104x: fix TP link detection de2104x: fix power management de2104x: disable autonegotiation on broken hardware net: fix a lockdep splat e1000e: 82579 do not gate auto config of PHY by hardware during nominal use ...
2 parents 050026f + 01db403 commit a2724f2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+444
-196
lines changed

‎drivers/net/3c59x.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2942,6 +2942,9 @@ static void vortex_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
29422942
{
29432943
struct vortex_private *vp = netdev_priv(dev);
29442944

2945+
if (!VORTEX_PCI(vp))
2946+
return;
2947+
29452948
wol->supported = WAKE_MAGIC;
29462949

29472950
wol->wolopts = 0;
@@ -2952,6 +2955,10 @@ static void vortex_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
29522955
static int vortex_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
29532956
{
29542957
struct vortex_private *vp = netdev_priv(dev);
2958+
2959+
if (!VORTEX_PCI(vp))
2960+
return -EOPNOTSUPP;
2961+
29552962
if (wol->wolopts & ~WAKE_MAGIC)
29562963
return -EINVAL;
29572964

@@ -3201,6 +3208,9 @@ static void acpi_set_WOL(struct net_device *dev)
32013208
return;
32023209
}
32033210

3211+
if (VORTEX_PCI(vp)->current_state < PCI_D3hot)
3212+
return;
3213+
32043214
/* Change the power state to D3; RxEnable doesn't take effect. */
32053215
pci_set_power_state(VORTEX_PCI(vp), PCI_D3hot);
32063216
}

‎drivers/net/atlx/atl1.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,6 +1251,12 @@ static void atl1_free_ring_resources(struct atl1_adapter *adapter)
12511251

12521252
rrd_ring->desc = NULL;
12531253
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;
12541260
}
12551261

12561262
static void atl1_setup_mac_ctrl(struct atl1_adapter *adapter)
@@ -2847,10 +2853,11 @@ static int atl1_resume(struct pci_dev *pdev)
28472853
pci_enable_wake(pdev, PCI_D3cold, 0);
28482854

28492855
atl1_reset_hw(&adapter->hw);
2850-
adapter->cmb.cmb->int_stats = 0;
28512856

2852-
if (netif_running(netdev))
2857+
if (netif_running(netdev)) {
2858+
adapter->cmb.cmb->int_stats = 0;
28532859
atl1_up(adapter);
2860+
}
28542861
netif_device_attach(netdev);
28552862

28562863
return 0;

‎drivers/net/e1000e/hw.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ enum e1e_registers {
5757
E1000_SCTL = 0x00024, /* SerDes Control - RW */
5858
E1000_FCAL = 0x00028, /* Flow Control Address Low - RW */
5959
E1000_FCAH = 0x0002C, /* Flow Control Address High -RW */
60+
E1000_FEXTNVM4 = 0x00024, /* Future Extended NVM 4 - RW */
6061
E1000_FEXTNVM = 0x00028, /* Future Extended NVM - RW */
6162
E1000_FCT = 0x00030, /* Flow Control Type - RW */
6263
E1000_VET = 0x00038, /* VLAN Ether Type - RW */

0 commit comments

Comments
 (0)