[PATCH for 3.8 0/8] compat-drivers: fixes for linux-3.8.y

[PATCH for 3.8 0/8] compat-drivers: fixes for linux-3.8.y

[Hauke Mehrtens]

This are some backports and patch refreshes for the linux-3.8.y branch.

Hauke Mehrtens (8):
  compat-drivers: remove devinit and devexit from alx driver
  compat-drivers: deactivate loopback testing for older kernels
  compat-drivers: do not treat a warning as error
  compat-drivers: refresh patches
  compat-drivers: update genlog-3.8 for rc5
  compat-drivers: refresh patches
  compat-drivers: move disable_drm
  compat-drivers: refresh patches

 patches/collateral-evolutions/drm/03-swiotlb.patch |   12 +-
 .../drm/04-revert-prime-support.patch              |   18 +--
 .../drm/06-rename-config-options.patch             |    4 +-
 .../network/0001-netdev_ops.patch                  |    4 +-
 .../network/11-dev-pm-ops.patch                    |    6 +-
 .../network/12-mac80211-disable-tx-status.patch    |    4 +-
 .../network/14-device-type.patch                   |    2 +-
 .../collateral-evolutions/network/24-pcmcia.patch  |    2 +-
 .../network/40-netdev-hw-features.patch            |    6 +-
 .../network/54-get_ts_info.patch                   |    2 +-
 .../network/61-netdev-addr_assign_type.patch       |    2 +-
 .../network/62-usb_driver_lpm.patch                |    4 +-
 .../network/68-do-not-add-Werror.patch             |    8 ++
 .../network/0001-backport-alx.patch                |   16 +--
 .../network/0003-alx-remove-devinit-devexit.patch  |  116 ++++++++++++++++++++
 .../0004-alx-deactivate-loopback-test.patch        |   25 +++++
 scripts/driver-select                              |    2 +-
 scripts/genlog-3.8                                 |    2 +-
 18 files changed, 192 insertions(+), 43 deletions(-)
 create mode 100644 patches/collateral-evolutions/network/68-do-not-add-Werror.patch
 create mode 100644 patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch
 create mode 100644 patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch

-- 
1.7.10.4

[PATCH for 3.8 1/8] compat-drivers: remove devinit and devexit from alx driver

[Hauke Mehrtens]

Upstream commit 300a589a5c74a4b09de2095599581914364c96b1

devinit and devexit were removed from kernel version 3.8 and using it
causes compile problems.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0003-alx-remove-devinit-devexit.patch  |  116 ++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch

diff --git a/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch b/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch
new file mode 100644
index 0000000..0b0ba96
--- /dev/null
+++ b/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch
@@ -0,0 +1,116 @@
+--- a/drivers/net/ethernet/atheros/alx/alx.h
++++ b/drivers/net/ethernet/atheros/alx/alx.h
+@@ -190,7 +190,7 @@ struct alx_adapter {
+ 
+ /* needed by alx_ethtool.c */
+ extern void alx_reinit(struct alx_adapter *adpt);
+-extern void __devinit alx_set_ethtool_ops(struct net_device *dev);
++extern void alx_set_ethtool_ops(struct net_device *dev);
+ extern char alx_drv_name[];
+ extern char alx_drv_version[];
+ 
+--- a/drivers/net/ethernet/atheros/alx/alx_ethtool.c
++++ b/drivers/net/ethernet/atheros/alx/alx_ethtool.c
+@@ -965,7 +965,7 @@ static const struct ethtool_ops alx_etht
+ 	.set_priv_flags  = alx_set_priv_flags,
+ };
+ 
+-void __devinit alx_set_ethtool_ops(struct net_device *dev)
++void alx_set_ethtool_ops(struct net_device *dev)
+ {
+ 	SET_ETHTOOL_OPS(dev, &alx_ethtool_ops);
+ }
+--- a/drivers/net/ethernet/atheros/alx/alx_hw.c
++++ b/drivers/net/ethernet/atheros/alx/alx_hw.c
+@@ -1379,12 +1379,12 @@ void __alx_update_hw_stats(struct alx_hw
+ 	}
+ }
+ 
+-static const struct alx_platform_patch plats[] __devinitdata = {
++static const struct alx_platform_patch plats[] = {
+ {0x1091, 0x00, 0x1969, 0x0091, 0x1001},
+ {0},
+ };
+ 
+-void __devinit alx_patch_assign(struct alx_hw *hw)
++void alx_patch_assign(struct alx_hw *hw)
+ {
+ 	int i = 0;
+ 
+@@ -1403,7 +1403,7 @@ void __devinit alx_patch_assign(struct a
+ 	}
+ }
+ 
+-bool __devinit alx_get_phy_info(struct alx_hw *hw)
++bool alx_get_phy_info(struct alx_hw *hw)
+ {
+ 	u16  devs1, devs2;
+ 
+--- a/drivers/net/ethernet/atheros/alx/alx_hw.h
++++ b/drivers/net/ethernet/atheros/alx/alx_hw.h
+@@ -674,7 +674,7 @@ struct alx_platform_patch {
+ #define ALX_PF_ANY_REV		0x10000
+ 
+ 
+-void __devinit alx_patch_assign(struct alx_hw *hw);
+-bool __devinit alx_get_phy_info(struct alx_hw *hw);
++void alx_patch_assign(struct alx_hw *hw);
++bool alx_get_phy_info(struct alx_hw *hw);
+ 
+ #endif
+--- a/drivers/net/ethernet/atheros/alx/alx_main.c
++++ b/drivers/net/ethernet/atheros/alx/alx_main.c
+@@ -1007,7 +1007,7 @@ static void alx_free_irq(struct alx_adap
+ }
+ 
+ 
+-static int __devinit alx_identify_hw(struct alx_adapter *adpt)
++static int alx_identify_hw(struct alx_adapter *adpt)
+ {
+ 	struct pci_dev *pdev = adpt->pdev;
+ 	struct alx_hw *hw = &adpt->hw;
+@@ -1045,7 +1045,7 @@ static int __devinit alx_identify_hw(str
+ }
+ 
+ 
+-static const u8 def_rss_key[40] __devinitdata = {
++static const u8 def_rss_key[40] = {
+ 	0xE2, 0x91, 0xD7, 0x3D, 0x18, 0x05, 0xEC, 0x6C,
+ 	0x2A, 0x94, 0xB3, 0x0D, 0xA5, 0x4F, 0x2B, 0xEC,
+ 	0xEA, 0x49, 0xAF, 0x7C, 0xE2, 0x14, 0xAD, 0x3D,
+@@ -1071,7 +1071,7 @@ static void alx_init_def_rss_idt(struct
+  *    initialize general software structure (struct alx_adapter).
+  *    fields are inited based on PCI device information.
+  */
+-static int __devinit alx_init_sw(struct alx_adapter *adpt)
++static int alx_init_sw(struct alx_adapter *adpt)
+ {
+ 	struct pci_dev	*pdev = adpt->pdev;
+ 	struct alx_hw *hw = &adpt->hw;
+@@ -2484,7 +2484,7 @@ static const struct net_device_ops alx_n
+ };
+ 
+ /* alx_probe - Device Initialization Routine */
+-static int __devinit
++static int
+ alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+ {
+ 	struct net_device *netdev;
+@@ -2704,7 +2704,7 @@ err_dma_mask:
+ }
+ 
+ /* alx_remove - Device Removal Routine */
+-static void __devexit alx_remove(struct pci_dev *pdev)
++static void alx_remove(struct pci_dev *pdev)
+ {
+ 	struct alx_adapter *adpt = pci_get_drvdata(pdev);
+ 	struct alx_hw *hw = &adpt->hw;
+@@ -2826,7 +2826,7 @@ static struct pci_driver alx_driver = {
+ 	.name        = alx_drv_name,
+ 	.id_table    = alx_pci_tbl,
+ 	.probe       = alx_probe,
+-	.remove      = __devexit_p(alx_remove),
++	.remove      = alx_remove,
+ 	.shutdown    = alx_shutdown,
+ 	.err_handler = &alx_err_handler,
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,29))
-- 
1.7.10.4

[PATCH for 3.8 2/8] compat-drivers: deactivate loopback testing for older kernels

[Hauke Mehrtens]

Upstream commit 2e05b625a813f79ff4a255d120883ea8aa539972

ETH_TEST_FL_EXTERNAL_LB and ETH_TEST_FL_EXTERNAL_LB_DONE are not
available in kernel version < 3.1.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../0004-alx-deactivate-loopback-test.patch        |   25 ++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch

diff --git a/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch b/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch
new file mode 100644
index 0000000..3ed96a4
--- /dev/null
+++ b/patches/unified-drivers/network/0004-alx-deactivate-loopback-test.patch
@@ -0,0 +1,25 @@
+--- a/drivers/net/ethernet/atheros/alx/alx_ethtool.c
++++ b/drivers/net/ethernet/atheros/alx/alx_ethtool.c
+@@ -1687,7 +1687,9 @@ static void alx_self_test(struct net_dev
+ {
+ 	struct alx_adapter *adpt = netdev_priv(netdev);
+ 	bool if_running = netif_running(netdev);
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ 	bool phy_lpback = etest->flags & ETH_TEST_FL_EXTERNAL_LB;
++#endif
+ 
+ 	ALX_FLAG_SET(adpt, TESTING);
+ 	memset(data, 0, sizeof(u64) * ALX_TEST_LEN);
+@@ -1707,10 +1709,12 @@ static void alx_self_test(struct net_dev
+ 		if (alx_diag_interrupt(adpt, &data[2]))
+ 			etest->flags |= ETH_TEST_FL_FAILED;
+ 
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+ 		if (phy_lpback)
+ 			etest->flags |= ETH_TEST_FL_EXTERNAL_LB_DONE;
+ 		if (alx_diag_loopback(adpt, &data[3], phy_lpback))
+ 			etest->flags |= ETH_TEST_FL_FAILED;
++#endif
+ 
+ 	} else {
+ 		netif_info(adpt, hw, adpt->netdev,  "online test start...\n");
-- 
1.7.10.4

[PATCH for 3.8 3/8] compat-drivers: do not treat a warning as error

[Hauke Mehrtens]

Upstream commit 8ccd930335cc1019122a24625d38e8e64677ec59

Older kernel version show more warnings like -Werror=unused-but-set-variable
and with this option they are treated as an error.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../collateral-evolutions/network/68-do-not-add-Werror.patch   |    8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/68-do-not-add-Werror.patch

diff --git a/patches/collateral-evolutions/network/68-do-not-add-Werror.patch b/patches/collateral-evolutions/network/68-do-not-add-Werror.patch
new file mode 100644
index 0000000..066df6e
--- /dev/null
+++ b/patches/collateral-evolutions/network/68-do-not-add-Werror.patch
@@ -0,0 +1,8 @@
+--- a/drivers/net/wireless/ath/wil6210/Makefile
++++ b/drivers/net/wireless/ath/wil6210/Makefile
+@@ -9,5 +9,4 @@ wil6210-objs += wmi.o
+ wil6210-objs += interrupt.o
+ wil6210-objs += txrx.o
+ 
+-subdir-ccflags-y += -Werror
+ subdir-ccflags-y += -D__CHECK_ENDIAN__
-- 
1.7.10.4

[PATCH for 3.8 4/8] compat-drivers: refresh patches

[Hauke Mehrtens]

refreshes patches based on linux 3.8-rc5 and alx alx-20130124

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../drm/04-revert-prime-support.patch              |    4 +--
 .../drm/06-rename-config-options.patch             |    4 +--
 .../network/0001-backport-alx.patch                |   16 ++++++------
 .../network/0003-alx-remove-devinit-devexit.patch  |   26 ++++++++++----------
 4 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
index 7fba759..95f2586 100644
--- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch
+++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
@@ -120,7 +120,7 @@ not < 3.3.0.
 +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -358,8 +358,10 @@ static const struct file_operations rade
+@@ -359,8 +359,10 @@ static const struct file_operations rade
  static struct drm_driver kms_driver = {
  	.driver_features =
  	    DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG |
@@ -133,7 +133,7 @@ not < 3.3.0.
  	.dev_priv_size = 0,
  	.load = radeon_driver_load_kms,
  	.firstopen = radeon_driver_firstopen_kms,
-@@ -394,10 +396,12 @@ static struct drm_driver kms_driver = {
+@@ -395,10 +397,12 @@ static struct drm_driver kms_driver = {
  	.dumb_destroy = radeon_mode_dumb_destroy,
  	.fops = &radeon_driver_kms_fops,
  
diff --git a/patches/collateral-evolutions/drm/06-rename-config-options.patch b/patches/collateral-evolutions/drm/06-rename-config-options.patch
index c52e13b..13ee755 100644
--- a/patches/collateral-evolutions/drm/06-rename-config-options.patch
+++ b/patches/collateral-evolutions/drm/06-rename-config-options.patch
@@ -174,7 +174,7 @@
  CFLAGS_radeon_trace_points.o := -I$(src)
 --- a/drivers/gpu/drm/radeon/radeon_drv.c
 +++ b/drivers/gpu/drm/radeon/radeon_drv.c
-@@ -230,7 +230,7 @@ static struct pci_device_id pciidlist[]
+@@ -231,7 +231,7 @@ static struct pci_device_id pciidlist[]
  	radeon_PCI_IDS
  };
  
@@ -183,7 +183,7 @@
  MODULE_DEVICE_TABLE(pci, pciidlist);
  #endif
  
-@@ -444,7 +444,7 @@ static int __init radeon_init(void)
+@@ -445,7 +445,7 @@ static int __init radeon_init(void)
  #endif
  	/* if enabled by default */
  	if (radeon_modeset == -1) {
diff --git a/patches/unified-drivers/network/0001-backport-alx.patch b/patches/unified-drivers/network/0001-backport-alx.patch
index 228a033..9bd7666 100644
--- a/patches/unified-drivers/network/0001-backport-alx.patch
+++ b/patches/unified-drivers/network/0001-backport-alx.patch
@@ -25,7 +25,7 @@ This should go into patches/01-netdev.patch
  
  	memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);
  	memcpy(hw->mac_addr, addr->sa_data, netdev->addr_len);
-@@ -1135,6 +1141,7 @@ static void alx_set_vlan_mode(struct alx
+@@ -1137,6 +1143,7 @@ static void alx_set_vlan_mode(struct alx
  }
  
  
@@ -33,7 +33,7 @@ This should go into patches/01-netdev.patch
  static netdev_features_t alx_fix_features(struct net_device *netdev,
  					  netdev_features_t features)
  {
-@@ -1167,6 +1174,7 @@ static int alx_set_features(struct net_d
+@@ -1169,6 +1176,7 @@ static int alx_set_features(struct net_d
  
  	return 0;
  }
@@ -41,7 +41,7 @@ This should go into patches/01-netdev.patch
  
  /* alx_change_mtu - Change the Maximum Transfer Unit */
  static int alx_change_mtu(struct net_device *netdev, int new_mtu)
-@@ -1191,7 +1199,17 @@ static int alx_change_mtu(struct net_dev
+@@ -1193,7 +1201,17 @@ static int alx_change_mtu(struct net_dev
  		adpt->hw.mtu = new_mtu;
  		adpt->rxbuf_size = new_mtu > ALX_DEF_RXBUF_SIZE ?
  				   ALIGN(max_frame, 8) : ALX_DEF_RXBUF_SIZE;
@@ -59,7 +59,7 @@ This should go into patches/01-netdev.patch
  		if (netif_running(netdev))
  			alx_reinit(adpt);
  	}
-@@ -2474,8 +2474,10 @@ static const struct net_device_ops alx_n
+@@ -2458,8 +2476,10 @@ static const struct net_device_ops alx_n
  	.ndo_change_mtu         = alx_change_mtu,
  	.ndo_do_ioctl           = alx_ioctl,
  	.ndo_tx_timeout         = alx_tx_timeout,
@@ -70,7 +70,7 @@ This should go into patches/01-netdev.patch
  #ifdef CONFIG_NET_POLL_CONTROLLER
  	.ndo_poll_controller    = alx_poll_controller,
  #endif
-@@ -2577,7 +2579,7 @@ alx_probe(struct pci_dev *pdev, const st
+@@ -2561,7 +2581,7 @@ alx_probe(struct pci_dev *pdev, const st
  		goto err_iomap;
  	}
  
@@ -79,7 +79,7 @@ This should go into patches/01-netdev.patch
  	alx_set_ethtool_ops(netdev);
  	netdev->irq  = pdev->irq;
  	netdev->watchdog_timeo = ALX_WATCHDOG_TIME;
-@@ -2622,12 +2624,21 @@ alx_probe(struct pci_dev *pdev, const st
+@@ -2606,12 +2626,21 @@ alx_probe(struct pci_dev *pdev, const st
  		}
  	}
  
@@ -101,7 +101,7 @@ This should go into patches/01-netdev.patch
  
  	/* read permanent mac addr from register or eFuse */
  	if (alx_get_perm_macaddr(hw, hw->perm_addr)) {
-@@ -2803,6 +2814,8 @@ static struct pci_error_handlers alx_err
+@@ -2787,6 +2816,8 @@ static struct pci_error_handlers alx_err
  };
  
  #ifdef CONFIG_PM_SLEEP
@@ -110,7 +110,7 @@ This should go into patches/01-netdev.patch
  static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume);
  #define ALX_PM_OPS      (&alx_pm_ops)
  #else
-@@ -2816,7 +2829,12 @@ static struct pci_driver alx_driver = {
+@@ -2800,7 +2831,12 @@ static struct pci_driver alx_driver = {
  	.remove      = __devexit_p(alx_remove),
  	.shutdown    = alx_shutdown,
  	.err_handler = &alx_err_handler,
diff --git a/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch b/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch
index 0b0ba96..aedb845 100644
--- a/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch
+++ b/patches/unified-drivers/network/0003-alx-remove-devinit-devexit.patch
@@ -1,8 +1,8 @@
 --- a/drivers/net/ethernet/atheros/alx/alx.h
 +++ b/drivers/net/ethernet/atheros/alx/alx.h
-@@ -190,7 +190,7 @@ struct alx_adapter {
- 
- /* needed by alx_ethtool.c */
+@@ -206,7 +206,7 @@ extern int alx_alloc_rxring_buf(struct a
+ extern void alx_init_intr(struct alx_adapter *adpt);
+ extern void alx_disable_advanced_intr(struct alx_adapter *adpt);
  extern void alx_reinit(struct alx_adapter *adpt);
 -extern void __devinit alx_set_ethtool_ops(struct net_device *dev);
 +extern void alx_set_ethtool_ops(struct net_device *dev);
@@ -11,8 +11,8 @@
  
 --- a/drivers/net/ethernet/atheros/alx/alx_ethtool.c
 +++ b/drivers/net/ethernet/atheros/alx/alx_ethtool.c
-@@ -965,7 +965,7 @@ static const struct ethtool_ops alx_etht
- 	.set_priv_flags  = alx_set_priv_flags,
+@@ -1795,7 +1795,7 @@ static const struct ethtool_ops alx_etht
+ 	.set_priv_flags	 = alx_set_priv_flags,
  };
  
 -void __devinit alx_set_ethtool_ops(struct net_device *dev)
@@ -22,7 +22,7 @@
  }
 --- a/drivers/net/ethernet/atheros/alx/alx_hw.c
 +++ b/drivers/net/ethernet/atheros/alx/alx_hw.c
-@@ -1379,12 +1379,12 @@ void __alx_update_hw_stats(struct alx_hw
+@@ -1416,12 +1416,12 @@ void __alx_update_hw_stats(struct alx_hw
  	}
  }
  
@@ -37,7 +37,7 @@
  {
  	int i = 0;
  
-@@ -1403,7 +1403,7 @@ void __devinit alx_patch_assign(struct a
+@@ -1440,7 +1440,7 @@ void __devinit alx_patch_assign(struct a
  	}
  }
  
@@ -48,7 +48,7 @@
  
 --- a/drivers/net/ethernet/atheros/alx/alx_hw.h
 +++ b/drivers/net/ethernet/atheros/alx/alx_hw.h
-@@ -674,7 +674,7 @@ struct alx_platform_patch {
+@@ -655,7 +655,7 @@ struct alx_platform_patch {
  #define ALX_PF_ANY_REV		0x10000
  
  
@@ -60,7 +60,7 @@
  #endif
 --- a/drivers/net/ethernet/atheros/alx/alx_main.c
 +++ b/drivers/net/ethernet/atheros/alx/alx_main.c
-@@ -1007,7 +1007,7 @@ static void alx_free_irq(struct alx_adap
+@@ -1000,7 +1000,7 @@ static void alx_free_irq(struct alx_adap
  }
  
  
@@ -78,7 +78,7 @@
  	0xE2, 0x91, 0xD7, 0x3D, 0x18, 0x05, 0xEC, 0x6C,
  	0x2A, 0x94, 0xB3, 0x0D, 0xA5, 0x4F, 0x2B, 0xEC,
  	0xEA, 0x49, 0xAF, 0x7C, 0xE2, 0x14, 0xAD, 0x3D,
-@@ -1071,7 +1071,7 @@ static void alx_init_def_rss_idt(struct
+@@ -1072,7 +1072,7 @@ void alx_init_def_rss_idt(struct alx_ada
   *    initialize general software structure (struct alx_adapter).
   *    fields are inited based on PCI device information.
   */
@@ -87,7 +87,7 @@
  {
  	struct pci_dev	*pdev = adpt->pdev;
  	struct alx_hw *hw = &adpt->hw;
-@@ -2484,7 +2484,7 @@ static const struct net_device_ops alx_n
+@@ -2486,7 +2486,7 @@ static const struct net_device_ops alx_n
  };
  
  /* alx_probe - Device Initialization Routine */
@@ -96,7 +96,7 @@
  alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  {
  	struct net_device *netdev;
-@@ -2704,7 +2704,7 @@ err_dma_mask:
+@@ -2706,7 +2706,7 @@ err_dma_mask:
  }
  
  /* alx_remove - Device Removal Routine */
@@ -105,7 +105,7 @@
  {
  	struct alx_adapter *adpt = pci_get_drvdata(pdev);
  	struct alx_hw *hw = &adpt->hw;
-@@ -2826,7 +2826,7 @@ static struct pci_driver alx_driver = {
+@@ -2828,7 +2828,7 @@ static struct pci_driver alx_driver = {
  	.name        = alx_drv_name,
  	.id_table    = alx_pci_tbl,
  	.probe       = alx_probe,
-- 
1.7.10.4

[PATCH for 3.8 5/8] compat-drivers: update genlog-3.8 for rc5

[Hauke Mehrtens]

Upstream commit 3e5178598c2ce38853638c42e0b3103ce39fa96e

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/genlog-3.8 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/genlog-3.8 b/scripts/genlog-3.8
index d89ecdc..72153cb 100755
--- a/scripts/genlog-3.8
+++ b/scripts/genlog-3.8
@@ -5,7 +5,7 @@ COMPAT_WIRELESS=$HOME/devel/compat-drivers/.git
 
 OLD_VER=7
 let VER="8"
-RC="-rc4"
+RC="-rc5"
 export GIT_DIR=${COMPAT_WIRELESS}
 CD_VER="$(git describe | sed -e 's|compat-drivers-v||g')"
 LOG="ChangeLog-${CD_VER}"
-- 
1.7.10.4

[PATCH for 3.8 6/8] compat-drivers: refresh patches

[Hauke Mehrtens]

refreshes patches based on linux 3.8-rc7.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/collateral-evolutions/network/0001-netdev_ops.patch        |    2 +-
 patches/collateral-evolutions/network/11-dev-pm-ops.patch          |    2 +-
 .../network/12-mac80211-disable-tx-status.patch                    |    4 ++--
 patches/collateral-evolutions/network/14-device-type.patch         |    2 +-
 patches/collateral-evolutions/network/24-pcmcia.patch              |    2 +-
 patches/collateral-evolutions/network/54-get_ts_info.patch         |    2 +-
 patches/collateral-evolutions/network/62-usb_driver_lpm.patch      |    4 ++--
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch
index 95f75ee..716bc82 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch
@@ -49,7 +49,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	if (unlikely(retval < 0)) {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1423,7 +1423,7 @@ usbnet_probe (struct usb_interface *udev
+@@ -1446,7 +1446,7 @@ usbnet_probe (struct usb_interface *udev
  		net->features |= NETIF_F_HIGHDMA;
  #endif
  
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
index 4afd308..6a7eb3e 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
@@ -164,7 +164,7 @@ calls on compat code with only slight modifications.
  static int __init
 --- a/drivers/net/wireless/iwlegacy/common.c
 +++ b/drivers/net/wireless/iwlegacy/common.c
-@@ -4906,8 +4906,17 @@ il_pci_resume(struct device *device)
+@@ -4899,8 +4899,17 @@ il_pci_resume(struct device *device)
  	return 0;
  }
  
diff --git a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch
index de53051..6b639b7 100644
--- a/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch
+++ b/patches/collateral-evolutions/network/12-mac80211-disable-tx-status.patch
@@ -6,7 +6,7 @@ So we need to just ifdef this part out.
 
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -1989,6 +1989,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -1992,6 +1992,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  		goto fail_rcu;
  	}
  
@@ -14,7 +14,7 @@ So we need to just ifdef this part out.
  	if (unlikely(!multicast && skb->sk &&
  		     skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
  		struct sk_buff *orig_skb = skb;
-@@ -2027,6 +2028,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2030,6 +2031,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
  			skb = orig_skb;
  		}
  	}
diff --git a/patches/collateral-evolutions/network/14-device-type.patch b/patches/collateral-evolutions/network/14-device-type.patch
index dff6e69..0ecc24a 100644
--- a/patches/collateral-evolutions/network/14-device-type.patch
+++ b/patches/collateral-evolutions/network/14-device-type.patch
@@ -36,7 +36,7 @@ compile warning.
  {
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -1340,13 +1340,17 @@ static const struct net_device_ops usbne
+@@ -1363,13 +1363,17 @@ static const struct net_device_ops usbne
  
  // precondition: never called in_interrupt
  
diff --git a/patches/collateral-evolutions/network/24-pcmcia.patch b/patches/collateral-evolutions/network/24-pcmcia.patch
index 56c0dfe..3538eb7 100644
--- a/patches/collateral-evolutions/network/24-pcmcia.patch
+++ b/patches/collateral-evolutions/network/24-pcmcia.patch
@@ -1400,7 +1400,7 @@
  	.suspend	= spectrum_cs_suspend,
 --- a/drivers/ssb/main.c
 +++ b/drivers/ssb/main.c
-@@ -510,7 +510,11 @@ static int ssb_devices_register(struct s
+@@ -519,7 +519,11 @@ static int ssb_devices_register(struct s
  			break;
  		case SSB_BUSTYPE_PCMCIA:
  #ifdef CONFIG_SSB_PCMCIAHOST
diff --git a/patches/collateral-evolutions/network/54-get_ts_info.patch b/patches/collateral-evolutions/network/54-get_ts_info.patch
index 7cec3d8..5e5764f 100644
--- a/patches/collateral-evolutions/network/54-get_ts_info.patch
+++ b/patches/collateral-evolutions/network/54-get_ts_info.patch
@@ -27,7 +27,7 @@ Date:   Tue Apr 3 22:59:17 2012 +0000
 
 --- a/drivers/net/usb/usbnet.c
 +++ b/drivers/net/usb/usbnet.c
-@@ -911,7 +911,9 @@ static const struct ethtool_ops usbnet_e
+@@ -933,7 +933,9 @@ static const struct ethtool_ops usbnet_e
  	.get_drvinfo		= usbnet_get_drvinfo,
  	.get_msglevel		= usbnet_get_msglevel,
  	.set_msglevel		= usbnet_set_msglevel,
diff --git a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
index e0d9637..717931e 100644
--- a/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
+++ b/patches/collateral-evolutions/network/62-usb_driver_lpm.patch
@@ -1,6 +1,6 @@
 --- a/drivers/bluetooth/ath3k.c
 +++ b/drivers/bluetooth/ath3k.c
-@@ -453,7 +453,9 @@ static struct usb_driver ath3k_driver =
+@@ -463,7 +463,9 @@ static struct usb_driver ath3k_driver =
  	.probe		= ath3k_probe,
  	.disconnect	= ath3k_disconnect,
  	.id_table	= ath3k_table,
@@ -48,7 +48,7 @@
  module_usb_driver(bpa10x_driver);
 --- a/drivers/bluetooth/btusb.c
 +++ b/drivers/bluetooth/btusb.c
-@@ -1224,7 +1224,9 @@ static struct usb_driver btusb_driver =
+@@ -1229,7 +1229,9 @@ static struct usb_driver btusb_driver =
  #endif
  	.id_table	= btusb_table,
  	.supports_autosuspend = 1,
-- 
1.7.10.4

[PATCH for 3.8 7/8] compat-drivers: move disable_drm

[Hauke Mehrtens]

Upstream commit 483aca89f39525a0d9bfcddade5beed19d659d7f

drm should be disabled when disable_bt_usb_ethernet is selected. This
disables drm also for e.g. b43.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 scripts/driver-select |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/driver-select b/scripts/driver-select
index 2c9f145..4f71e34 100755
--- a/scripts/driver-select
+++ b/scripts/driver-select
@@ -193,13 +193,13 @@ function disable_bt_usb_ethernet {
 	disable_ethernet
 	disable_bt
 	disable_update-initramfs
+	disable_drm
 }
 
 function disable_bt_usb_ethernet_var {
 	backup_file Makefile
 	disable_bt_usb_ethernet
 	disable_var_03
-	disable_drm
 }
 
 function enable_only_ethernet {
-- 
1.7.10.4

[PATCH for 3.8 8/8] compat-drivers: refresh patches

[Hauke Mehrtens]

refreshes patches based on linux 3.8.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 patches/collateral-evolutions/drm/03-swiotlb.patch       |   12 ++++++------
 .../drm/04-revert-prime-support.patch                    |   14 +++++++-------
 .../collateral-evolutions/network/0001-netdev_ops.patch  |    2 +-
 .../collateral-evolutions/network/11-dev-pm-ops.patch    |    4 ++--
 .../network/40-netdev-hw-features.patch                  |    6 +++---
 .../network/61-netdev-addr_assign_type.patch             |    2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/patches/collateral-evolutions/drm/03-swiotlb.patch b/patches/collateral-evolutions/drm/03-swiotlb.patch
index e6dc53f..8554da5 100644
--- a/patches/collateral-evolutions/drm/03-swiotlb.patch
+++ b/patches/collateral-evolutions/drm/03-swiotlb.patch
@@ -5,7 +5,7 @@ to backport it to compat.git. So revert the changes.
 
 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -1373,11 +1373,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
+@@ -1374,11 +1374,13 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
  	}
  #endif
  
@@ -19,7 +19,7 @@ to backport it to compat.git. So revert the changes.
  
  	r = ttm_pool_populate(ttm);
  	if (r) {
-@@ -1423,12 +1425,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
+@@ -1424,12 +1426,14 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
  	}
  #endif
  
@@ -36,7 +36,7 @@ to backport it to compat.git. So revert the changes.
  		if (ttm_dma->dma_address[i]) {
 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -602,11 +602,13 @@ static int radeon_ttm_tt_populate(struct
+@@ -603,11 +603,13 @@ static int radeon_ttm_tt_populate(struct
  	}
  #endif
  
@@ -50,7 +50,7 @@ to backport it to compat.git. So revert the changes.
  
  	r = ttm_pool_populate(ttm);
  	if (r) {
-@@ -648,12 +650,14 @@ static void radeon_ttm_tt_unpopulate(str
+@@ -649,12 +651,14 @@ static void radeon_ttm_tt_unpopulate(str
  	}
  #endif
  
@@ -65,7 +65,7 @@ to backport it to compat.git. So revert the changes.
  
  	for (i = 0; i < ttm->num_pages; i++) {
  		if (gtt->ttm.dma_address[i]) {
-@@ -876,6 +880,7 @@ static int radeon_ttm_debugfs_init(struc
+@@ -877,6 +881,7 @@ static int radeon_ttm_debugfs_init(struc
  	radeon_mem_types_list[i].show = &ttm_page_alloc_debugfs;
  	radeon_mem_types_list[i].driver_features = 0;
  	radeon_mem_types_list[i++].data = NULL;
@@ -73,7 +73,7 @@ to backport it to compat.git. So revert the changes.
  #ifdef CONFIG_SWIOTLB
  	if (swiotlb_nr_tbl()) {
  		sprintf(radeon_mem_types_names[i], "ttm_dma_page_pool");
-@@ -885,6 +890,7 @@ static int radeon_ttm_debugfs_init(struc
+@@ -886,6 +891,7 @@ static int radeon_ttm_debugfs_init(struc
  		radeon_mem_types_list[i++].data = NULL;
  	}
  #endif
diff --git a/patches/collateral-evolutions/drm/04-revert-prime-support.patch b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
index 95f2586..95e3fd7 100644
--- a/patches/collateral-evolutions/drm/04-revert-prime-support.patch
+++ b/patches/collateral-evolutions/drm/04-revert-prime-support.patch
@@ -161,7 +161,7 @@ not < 3.3.0.
  }
 --- a/drivers/gpu/drm/radeon/radeon_ttm.c
 +++ b/drivers/gpu/drm/radeon/radeon_ttm.c
-@@ -583,17 +583,21 @@ static int radeon_ttm_tt_populate(struct
+@@ -584,17 +584,21 @@ static int radeon_ttm_tt_populate(struct
  	struct radeon_ttm_tt *gtt = (void *)ttm;
  	unsigned i;
  	int r;
@@ -183,7 +183,7 @@ not < 3.3.0.
  
  	rdev = radeon_get_rdev(ttm->bdev);
  #if __OS_HAS_AGP
-@@ -637,10 +641,12 @@ static void radeon_ttm_tt_unpopulate(str
+@@ -638,10 +642,12 @@ static void radeon_ttm_tt_unpopulate(str
  	struct radeon_device *rdev;
  	struct radeon_ttm_tt *gtt = (void *)ttm;
  	unsigned i;
@@ -198,7 +198,7 @@ not < 3.3.0.
  #if __OS_HAS_AGP
 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
-@@ -1351,11 +1351,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
+@@ -1352,11 +1352,14 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
  	struct drm_device *dev;
  	unsigned i;
  	int r;
@@ -213,7 +213,7 @@ not < 3.3.0.
  	if (slave && ttm->sg) {
  		/* make userspace faulting work */
  		drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
-@@ -1363,6 +1366,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
+@@ -1364,6 +1367,7 @@ nouveau_ttm_tt_populate(struct ttm_tt *t
  		ttm->state = tt_unbound;
  		return 0;
  	}
@@ -221,7 +221,7 @@ not < 3.3.0.
  
  	drm = nouveau_bdev(ttm->bdev);
  	dev = drm->dev;
-@@ -1410,10 +1414,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
+@@ -1411,10 +1415,12 @@ nouveau_ttm_tt_unpopulate(struct ttm_tt
  	struct nouveau_drm *drm;
  	struct drm_device *dev;
  	unsigned i;
@@ -236,7 +236,7 @@ not < 3.3.0.
  	dev = drm->dev;
 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c
 +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c
-@@ -627,7 +627,10 @@ driver = {
+@@ -630,7 +630,10 @@ driver = {
  	.driver_features =
  		DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG |
  		DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
@@ -248,7 +248,7 @@ not < 3.3.0.
  
  	.load = nouveau_drm_load,
  	.unload = nouveau_drm_unload,
-@@ -648,10 +651,12 @@ driver = {
+@@ -651,10 +654,12 @@ driver = {
  	.ioctls = nouveau_ioctls,
  	.fops = &nouveau_driver_fops,
  
diff --git a/patches/collateral-evolutions/network/0001-netdev_ops.patch b/patches/collateral-evolutions/network/0001-netdev_ops.patch
index 716bc82..bfcaf00 100644
--- a/patches/collateral-evolutions/network/0001-netdev_ops.patch
+++ b/patches/collateral-evolutions/network/0001-netdev_ops.patch
@@ -201,7 +201,7 @@ Date:   Wed Nov 19 21:32:24 2008 -0800
  	atl1e_set_ethtool_ops(netdev);
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2416,7 +2416,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2473,7 +2473,7 @@ static int atl1c_init_netdev(struct net_
  	SET_NETDEV_DEV(netdev, &pdev->dev);
  	pci_set_drvdata(pdev, netdev);
  
diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops.patch b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
index 6a7eb3e..9825b53 100644
--- a/patches/collateral-evolutions/network/11-dev-pm-ops.patch
+++ b/patches/collateral-evolutions/network/11-dev-pm-ops.patch
@@ -34,7 +34,7 @@ calls on compat code with only slight modifications.
  int __init bcma_host_pci_init(void)
 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
 +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
-@@ -2690,6 +2690,9 @@ static const struct pci_error_handlers a
+@@ -2747,6 +2747,9 @@ static const struct pci_error_handlers a
  	.resume = atl1c_io_resume,
  };
  
@@ -44,7 +44,7 @@ calls on compat code with only slight modifications.
  static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume);
  
  static struct pci_driver atl1c_driver = {
-@@ -2699,7 +2702,12 @@ static struct pci_driver atl1c_driver =
+@@ -2756,7 +2759,12 @@ static struct pci_driver atl1c_driver =
  	.remove   = atl1c_remove,
  	.shutdown = atl1c_shutdown,
  	.err_handler = &atl1c_err_handler,
diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features.patch b/patches/collateral-evolutions/network/40-netdev-hw-features.patch
index 59f2667..d944e6f 100644
--- a/patches/collateral-evolutions/network/40-netdev-hw-features.patch
+++ b/patches/collateral-evolutions/network/40-netdev-hw-features.patch
@@ -84,7 +84,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  		atl1c_up(adapter);
  		clear_bit(__AT_RESETTING, &adapter->flags);
  	}
-@@ -2405,8 +2418,10 @@ static const struct net_device_ops atl1c
+@@ -2462,8 +2475,10 @@ static const struct net_device_ops atl1c
  	.ndo_set_mac_address	= atl1c_set_mac_addr,
  	.ndo_set_rx_mode	= atl1c_set_multi,
  	.ndo_change_mtu		= atl1c_change_mtu,
@@ -95,7 +95,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  	.ndo_do_ioctl		= atl1c_ioctl,
  	.ndo_tx_timeout		= atl1c_tx_timeout,
  	.ndo_get_stats		= atl1c_get_stats,
-@@ -2425,6 +2440,7 @@ static int atl1c_init_netdev(struct net_
+@@ -2482,6 +2497,7 @@ static int atl1c_init_netdev(struct net_
  	atl1c_set_ethtool_ops(netdev);
  
  	/* TODO: add when ready */
@@ -103,7 +103,7 @@ Date:   Thu Apr 7 07:32:18 2011 +0000
  	netdev->hw_features =	NETIF_F_SG	   |
  				NETIF_F_HW_CSUM	   |
  				NETIF_F_HW_VLAN_RX |
-@@ -2432,6 +2448,14 @@ static int atl1c_init_netdev(struct net_
+@@ -2489,6 +2505,14 @@ static int atl1c_init_netdev(struct net_
  				NETIF_F_TSO6;
  	netdev->features =	netdev->hw_features |
  				NETIF_F_HW_VLAN_TX;
diff --git a/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
index b476617..d9f0087 100644
--- a/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
+++ b/patches/collateral-evolutions/network/61-netdev-addr_assign_type.patch
@@ -17,7 +17,7 @@ v2.6.36-rc1~571^2~104
  
  	atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.mac_addr);
  
-@@ -2568,7 +2570,9 @@ static int atl1c_probe(struct pci_dev *p
+@@ -2625,7 +2627,9 @@ static int atl1c_probe(struct pci_dev *p
  	}
  	if (atl1c_read_mac_addr(&adapter->hw)) {
  		/* got a random MAC address, set NET_ADDR_RANDOM to netdev */
-- 
1.7.10.4