From c980492a6720ec2a5a897e5087f471d3d3d46100 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 10 Apr 2012 15:35:36 -0700 Subject: [PATCH] compat-wireless: fix patches/01-netdev.patch This was caused by these patches: Author: Francois Romieu Date: Fri Mar 9 19:28:28 2012 +0100 atl1e: stop using net_device.{base_addr, irq}. Signed-off-by: Francois Romieu Cc: Jay Cliburn Cc: Chris Snook Author: Francois Romieu Date: Fri Mar 9 19:22:31 2012 +0100 atl1c: stop using net_device.{base_addr, irq}. Signed-off-by: Francois Romieu Cc: Jay Cliburn Cc: Chris Snook I cannot find an explanation to the removal of the assignments: netdev->base_addr = (unsigned long)adapter->hw.hw_addr; netdev->irq = pdev->irq; even on the public mailing lists, and the commit logs do not explain *why* these are being removed. For now just leave this as is... Signed-off-by: Luis R. Rodriguez --- patches/01-netdev.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index f9cb6f5ece33..2e230199c33a 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -336,10 +336,10 @@ without creating a headache on maintenance of the pathes. } --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -2234,7 +2234,7 @@ static int atl1e_init_netdev(struct net_ +@@ -2230,7 +2230,7 @@ static int atl1e_init_netdev(struct net_ + SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); - netdev->irq = pdev->irq; - netdev->netdev_ops = &atl1e_netdev_ops; + netdev_attach_ops(netdev, &atl1e_netdev_ops); @@ -347,10 +347,10 @@ without creating a headache on maintenance of the pathes. atl1e_set_ethtool_ops(netdev); --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -2617,7 +2617,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2615,7 +2615,7 @@ static int atl1c_init_netdev(struct net_ + SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); - netdev->irq = pdev->irq; - netdev->netdev_ops = &atl1c_netdev_ops; + netdev_attach_ops(netdev, &atl1c_netdev_ops); netdev->watchdog_timeo = AT_TX_WATCHDOG; -- 2.30.2