From: Luis R. Rodriguez Date: Tue, 13 Mar 2012 00:43:39 +0000 (-0700) Subject: compat-wireless: refresh linux-next-pending patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d8cf8f68ce9872702e9885a67ac4c8bb617bec87;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh linux-next-pending patches Signed-off-by: Luis R. Rodriguez --- diff --git a/linux-next-pending/0001-alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch b/linux-next-pending/0001-alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch index 13a22ab94af4..e40ea7c9a1a2 100644 --- a/linux-next-pending/0001-alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch +++ b/linux-next-pending/0001-alx-add-new-QCA-ethernet-driver-which-supercedes-atl.patch @@ -77,11 +77,9 @@ Signed-off-by: Luis R. Rodriguez create mode 100644 drivers/net/ethernet/atheros/alx/alx_main.c create mode 100644 drivers/net/ethernet/atheros/alx/alx_sw.h -diff --git a/MAINTAINERS b/MAINTAINERS -index c9759ca..e4ef2c3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -1300,6 +1300,17 @@ W: http://atl1.sourceforge.net +@@ -1301,6 +1301,17 @@ W: http://atl1.sourceforge.net S: Maintained F: drivers/net/ethernet/atheros/ @@ -99,8 +97,6 @@ index c9759ca..e4ef2c3 100644 ATM M: Chas Williams L: linux-atm-general@lists.sourceforge.net (moderated for non-subscribers) -diff --git a/drivers/net/ethernet/atheros/Kconfig b/drivers/net/ethernet/atheros/Kconfig -index 1ed886d..a1cfc98 100644 --- a/drivers/net/ethernet/atheros/Kconfig +++ b/drivers/net/ethernet/atheros/Kconfig @@ -56,15 +56,55 @@ config ATL1E @@ -160,8 +156,6 @@ index 1ed886d..a1cfc98 100644 + will be called alx. + endif # NET_VENDOR_ATHEROS -diff --git a/drivers/net/ethernet/atheros/Makefile b/drivers/net/ethernet/atheros/Makefile -index e7e76fb..5cf1c65 100644 --- a/drivers/net/ethernet/atheros/Makefile +++ b/drivers/net/ethernet/atheros/Makefile @@ -6,3 +6,4 @@ obj-$(CONFIG_ATL1) += atlx/ @@ -169,18 +163,12 @@ index e7e76fb..5cf1c65 100644 obj-$(CONFIG_ATL1E) += atl1e/ obj-$(CONFIG_ATL1C) += atl1c/ +obj-$(CONFIG_ALX) += alx/ -diff --git a/drivers/net/ethernet/atheros/alx/Makefile b/drivers/net/ethernet/atheros/alx/Makefile -new file mode 100644 -index 0000000..9f607d3 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_ALX) += alx.o +alx-objs := alx_main.o alx_ethtool.o alc_cb.o alc_hw.o alf_cb.o alf_hw.o +ccflags-y += -D__CHECK_ENDIAN__ -diff --git a/drivers/net/ethernet/atheros/alx/alc_cb.c b/drivers/net/ethernet/atheros/alx/alc_cb.c -new file mode 100644 -index 0000000..8c42c3b --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alc_cb.c @@ -0,0 +1,912 @@ @@ -1096,9 +1084,6 @@ index 0000000..8c42c3b + return 0; +} + -diff --git a/drivers/net/ethernet/atheros/alx/alc_hw.c b/drivers/net/ethernet/atheros/alx/alc_hw.c -new file mode 100644 -index 0000000..b0eb72c --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alc_hw.c @@ -0,0 +1,1087 @@ @@ -2189,9 +2174,6 @@ index 0000000..b0eb72c + return LX_DRV_PHY_UNKNOWN; +} + -diff --git a/drivers/net/ethernet/atheros/alx/alc_hw.h b/drivers/net/ethernet/atheros/alx/alc_hw.h -new file mode 100644 -index 0000000..492b4c1 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alc_hw.h @@ -0,0 +1,1324 @@ @@ -3519,9 +3501,6 @@ index 0000000..492b4c1 + +#endif/*L1C_HW_H_*/ + -diff --git a/drivers/net/ethernet/atheros/alx/alf_cb.c b/drivers/net/ethernet/atheros/alx/alf_cb.c -new file mode 100644 -index 0000000..d267760 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alf_cb.c @@ -0,0 +1,1187 @@ @@ -4712,9 +4691,6 @@ index 0000000..d267760 + return 0; +} + -diff --git a/drivers/net/ethernet/atheros/alx/alf_hw.c b/drivers/net/ethernet/atheros/alx/alf_hw.c -new file mode 100644 -index 0000000..3301457 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alf_hw.c @@ -0,0 +1,918 @@ @@ -5636,9 +5612,6 @@ index 0000000..3301457 + return LX_DRV_PHY_UNKNOWN; +} + -diff --git a/drivers/net/ethernet/atheros/alx/alf_hw.h b/drivers/net/ethernet/atheros/alx/alf_hw.h -new file mode 100644 -index 0000000..384af9a --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alf_hw.h @@ -0,0 +1,2098 @@ @@ -7740,9 +7713,6 @@ index 0000000..384af9a + +#endif/*L1F_HW_H_*/ + -diff --git a/drivers/net/ethernet/atheros/alx/alx.h b/drivers/net/ethernet/atheros/alx/alx.h -new file mode 100644 -index 0000000..6482bee --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alx.h @@ -0,0 +1,670 @@ @@ -8416,9 +8386,6 @@ index 0000000..6482bee +#endif + +#endif /* _ALX_H_ */ -diff --git a/drivers/net/ethernet/atheros/alx/alx_ethtool.c b/drivers/net/ethernet/atheros/alx/alx_ethtool.c -new file mode 100644 -index 0000000..c044133 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alx_ethtool.c @@ -0,0 +1,519 @@ @@ -8941,9 +8908,6 @@ index 0000000..c044133 +{ + SET_ETHTOOL_OPS(netdev, &alx_ethtool_ops); +} -diff --git a/drivers/net/ethernet/atheros/alx/alx_hwcom.h b/drivers/net/ethernet/atheros/alx/alx_hwcom.h -new file mode 100644 -index 0000000..d3bd2f1 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alx_hwcom.h @@ -0,0 +1,187 @@ @@ -9134,9 +9098,6 @@ index 0000000..d3bd2f1 + +#endif/*_ALX_HWCOMMON_H_*/ + -diff --git a/drivers/net/ethernet/atheros/alx/alx_main.c b/drivers/net/ethernet/atheros/alx/alx_main.c -new file mode 100644 -index 0000000..a51c608 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alx_main.c @@ -0,0 +1,3899 @@ @@ -13039,9 +13000,6 @@ index 0000000..a51c608 + + +module_exit(alx_exit_module); -diff --git a/drivers/net/ethernet/atheros/alx/alx_sw.h b/drivers/net/ethernet/atheros/alx/alx_sw.h -new file mode 100644 -index 0000000..3daa392 --- /dev/null +++ b/drivers/net/ethernet/atheros/alx/alx_sw.h @@ -0,0 +1,493 @@ @@ -13538,6 +13496,3 @@ index 0000000..3daa392 + +#endif /* _ALX_SW_H_ */ + --- -1.7.4.15.g7811d - diff --git a/linux-next-pending/0002-backport-alx.patch b/linux-next-pending/0002-backport-alx.patch index 2486e38fd1b3..1eae43135653 100644 --- a/linux-next-pending/0002-backport-alx.patch +++ b/linux-next-pending/0002-backport-alx.patch @@ -14,7 +14,7 @@ This should go into patches/01-netdev.patch } -@@ -341,8 +341,10 @@ static int alx_set_mac_address(struct ne +@@ -337,8 +341,10 @@ static int alx_set_mac_address(struct ne if (netif_running(netdev)) return -EBUSY; @@ -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); -@@ -2483,7 +2487,7 @@ static void alx_free_all_rtx_descriptor( +@@ -2483,7 +2489,7 @@ static void alx_free_all_rtx_descriptor( ring_header->size = ring_header->used = 0; } @@ -34,7 +34,7 @@ This should go into patches/01-netdev.patch static netdev_features_t alx_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -2515,6 +2519,8 @@ static int alx_set_features(struct net_d +@@ -2515,6 +2521,8 @@ static int alx_set_features(struct net_d alx_vlan_mode(netdev, features); return 0; } @@ -43,7 +43,7 @@ This should go into patches/01-netdev.patch /* * alx_change_mtu - Change the Maximum Transfer Unit */ -@@ -2538,7 +2544,17 @@ static int alx_change_mtu(struct net_dev +@@ -2538,7 +2546,17 @@ static int alx_change_mtu(struct net_dev adpt->hw.mtu = new_mtu; adpt->rxbuf_size = new_mtu > ALX_DEF_RX_BUF_SIZE ? ALIGN(max_frame, 8) : ALX_DEF_RX_BUF_SIZE; @@ -61,7 +61,7 @@ This should go into patches/01-netdev.patch alx_reinit_locked(adpt); } -@@ -3444,8 +3460,10 @@ static const struct net_device_ops alx_n +@@ -3444,8 +3462,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, @@ -72,7 +72,7 @@ This should go into patches/01-netdev.patch #ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = alx_poll_controller, #endif -@@ -3532,7 +3550,7 @@ static int __devinit alx_init(struct pci +@@ -3532,7 +3552,7 @@ static int __devinit alx_init(struct pci netdev->base_addr = (unsigned long)adpt->hw.hw_addr; /* set cb member of netdev structure*/ @@ -81,7 +81,7 @@ This should go into patches/01-netdev.patch alx_set_ethtool_ops(netdev); netdev->watchdog_timeo = ALX_WATCHDOG_TIME; strncpy(netdev->name, pci_name(pdev), sizeof(netdev->name) - 1); -@@ -3580,6 +3598,7 @@ static int __devinit alx_init(struct pci +@@ -3580,6 +3600,7 @@ static int __devinit alx_init(struct pci adpt->max_rxques = min_t(int, ALX_MAX_RX_QUEUES, num_online_cpus()); adpt->max_txques = min_t(int, ALX_MAX_TX_QUEUES, num_online_cpus()); @@ -89,7 +89,7 @@ This should go into patches/01-netdev.patch netdev->hw_features = NETIF_F_SG | NETIF_F_HW_CSUM | NETIF_F_HW_VLAN_RX; -@@ -3591,6 +3610,19 @@ static int __devinit alx_init(struct pci +@@ -3591,6 +3612,19 @@ static int __devinit alx_init(struct pci } netdev->features = netdev->hw_features | NETIF_F_HW_VLAN_TX; @@ -109,7 +109,7 @@ This should go into patches/01-netdev.patch /* get mac addr and perm mac addr, set to register */ if (hw->cbs.get_mac_addr) -@@ -3862,6 +3894,8 @@ static struct pci_error_handlers alx_err +@@ -3862,6 +3896,8 @@ static struct pci_error_handlers alx_err #ifdef CONFIG_PM_SLEEP static SIMPLE_DEV_PM_OPS(alx_pm_ops, alx_suspend, alx_resume); #define ALX_PM_OPS (&alx_pm_ops) @@ -118,7 +118,7 @@ This should go into patches/01-netdev.patch #else #define ALX_PM_OPS NULL #endif -@@ -3874,7 +3908,12 @@ static struct pci_driver alx_driver = { +@@ -3874,7 +3910,12 @@ static struct pci_driver alx_driver = { .remove = __devexit_p(alx_remove), .shutdown = alx_shutdown, .err_handler = &alx_err_handler,