From 2ce9954d94e43dba1b7f890144b7949064423e2a Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 10 Jul 2012 12:08:33 -0700 Subject: [PATCH] compat-wireless: refresh patches for next-20120710 Signed-off-by: Luis R. Rodriguez --- patches/0001-netdev_ops.patch | 2 +- patches/11-dev-pm-ops.patch | 4 ++-- patches/25-multicast-list_head.patch | 12 ++++++------ patches/29-sdio_no_suspend.patch | 6 +++--- patches/40-netdev-hw-features.patch | 12 ++++++------ patches/61-netdev-addr_assign_type.patch | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch index 12dd7e7edd4c..74493ad7635e 100644 --- a/patches/0001-netdev_ops.patch +++ b/patches/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 -@@ -2417,7 +2417,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2416,7 +2416,7 @@ static int atl1c_init_netdev(struct net_ SET_NETDEV_DEV(netdev, &pdev->dev); pci_set_drvdata(pdev, netdev); diff --git a/patches/11-dev-pm-ops.patch b/patches/11-dev-pm-ops.patch index 47de0761a1dd..8480ec8df247 100644 --- a/patches/11-dev-pm-ops.patch +++ b/patches/11-dev-pm-ops.patch @@ -35,7 +35,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 -@@ -2694,6 +2694,9 @@ static struct pci_error_handlers atl1c_e +@@ -2693,6 +2693,9 @@ static struct pci_error_handlers atl1c_e static SIMPLE_DEV_PM_OPS(atl1c_pm_ops, atl1c_suspend, atl1c_resume); @@ -45,7 +45,7 @@ calls on compat code with only slight modifications. static struct pci_driver atl1c_driver = { .name = atl1c_driver_name, .id_table = atl1c_pci_tbl, -@@ -2701,7 +2704,12 @@ static struct pci_driver atl1c_driver = +@@ -2700,7 +2703,12 @@ static struct pci_driver atl1c_driver = .remove = __devexit_p(atl1c_remove), .shutdown = atl1c_shutdown, .err_handler = &atl1c_err_handler, diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 80c915e23edf..0f0e273deaf4 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -13,7 +13,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -411,7 +411,11 @@ static void atl1c_set_multi(struct net_d +@@ -410,7 +410,11 @@ static void atl1c_set_multi(struct net_d /* comoute mc addresses' hash value ,and put it into hash table */ netdev_for_each_mc_addr(ha, netdev) { @@ -321,7 +321,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 p += sprintf(p, "num_tx_bytes = %lu\n", priv->stats.tx_bytes); --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c -@@ -2564,15 +2564,21 @@ struct mwl8k_cmd_mac_multicast_adr { +@@ -2563,15 +2563,21 @@ struct mwl8k_cmd_mac_multicast_adr { static struct mwl8k_cmd_pkt * __mwl8k_cmd_mac_multicast_adr(struct ieee80211_hw *hw, int allmulti, @@ -343,7 +343,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 if (allmulti || mc_count > priv->num_mcaddrs) { allmulti = 1; -@@ -2593,13 +2599,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee +@@ -2592,13 +2598,27 @@ __mwl8k_cmd_mac_multicast_adr(struct iee if (allmulti) { cmd->action |= cpu_to_le16(MWL8K_ENABLE_RX_ALL_MULTICAST); } else if (mc_count) { @@ -371,7 +371,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } } -@@ -4823,7 +4843,11 @@ mwl8k_bss_info_changed(struct ieee80211_ +@@ -4822,7 +4842,11 @@ mwl8k_bss_info_changed(struct ieee80211_ } static u64 mwl8k_prepare_multicast(struct ieee80211_hw *hw, @@ -383,7 +383,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 { struct mwl8k_cmd_pkt *cmd; -@@ -4834,7 +4858,11 @@ static u64 mwl8k_prepare_multicast(struc +@@ -4833,7 +4857,11 @@ static u64 mwl8k_prepare_multicast(struc * we'll end up throwing this packet away and creating a new * one in mwl8k_configure_filter(). */ @@ -395,7 +395,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return (unsigned long)cmd; } -@@ -4956,7 +4984,11 @@ static void mwl8k_configure_filter(struc +@@ -4955,7 +4983,11 @@ static void mwl8k_configure_filter(struc */ if (*total_flags & FIF_ALLMULTI) { kfree(cmd); diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index 26b859a3d642..f0847526850c 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -171,7 +171,7 @@ suspend and resume that are not backported. }, --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c -@@ -1051,6 +1051,7 @@ static void btmrvl_sdio_remove(struct sd +@@ -1052,6 +1052,7 @@ static void btmrvl_sdio_remove(struct sd } } @@ -179,7 +179,7 @@ suspend and resume that are not backported. static int btmrvl_sdio_suspend(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); -@@ -1146,6 +1147,7 @@ static const struct dev_pm_ops btmrvl_sd +@@ -1147,6 +1148,7 @@ static const struct dev_pm_ops btmrvl_sd .suspend = btmrvl_sdio_suspend, .resume = btmrvl_sdio_resume, }; @@ -187,7 +187,7 @@ suspend and resume that are not backported. static struct sdio_driver bt_mrvl_sdio = { .name = "btmrvl_sdio", -@@ -1154,7 +1156,9 @@ static struct sdio_driver bt_mrvl_sdio = +@@ -1155,7 +1157,9 @@ static struct sdio_driver bt_mrvl_sdio = .remove = btmrvl_sdio_remove, .drv = { .owner = THIS_MODULE, diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch index 327781218d2d..57bfbc78cdce 100644 --- a/patches/40-netdev-hw-features.patch +++ b/patches/40-netdev-hw-features.patch @@ -48,7 +48,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 void atl1c_set_ethtool_ops(struct net_device *netdev) --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -493,6 +493,7 @@ static void atl1c_set_rxbufsize(struct a +@@ -492,6 +492,7 @@ static void atl1c_set_rxbufsize(struct a roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE; } @@ -56,7 +56,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 static netdev_features_t atl1c_fix_features(struct net_device *netdev, netdev_features_t features) { -@@ -521,6 +522,7 @@ static int atl1c_set_features(struct net +@@ -520,6 +521,7 @@ static int atl1c_set_features(struct net return 0; } @@ -64,7 +64,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 /* * atl1c_change_mtu - Change the Maximum Transfer Unit -@@ -553,8 +555,19 @@ static int atl1c_change_mtu(struct net_d +@@ -552,8 +554,19 @@ static int atl1c_change_mtu(struct net_d netdev->mtu = new_mtu; adapter->hw.max_frame_size = new_mtu; atl1c_set_rxbufsize(adapter, netdev); @@ -84,7 +84,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 atl1c_up(adapter); clear_bit(__AT_RESETTING, &adapter->flags); } -@@ -2406,8 +2419,10 @@ static const struct net_device_ops atl1c +@@ -2405,8 +2418,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, -@@ -2426,6 +2441,7 @@ static int atl1c_init_netdev(struct net_ +@@ -2425,6 +2440,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 | -@@ -2433,6 +2449,14 @@ static int atl1c_init_netdev(struct net_ +@@ -2432,6 +2448,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/61-netdev-addr_assign_type.patch b/patches/61-netdev-addr_assign_type.patch index cee6f5e325dc..e2c15c6ca4e9 100644 --- a/patches/61-netdev-addr_assign_type.patch +++ b/patches/61-netdev-addr_assign_type.patch @@ -7,7 +7,7 @@ v2.6.36-rc1~571^2~104 --- a/drivers/net/ethernet/atheros/atl1c/atl1c_main.c +++ b/drivers/net/ethernet/atheros/atl1c/atl1c_main.c -@@ -477,7 +477,9 @@ static int atl1c_set_mac_addr(struct net +@@ -476,7 +476,9 @@ static int atl1c_set_mac_addr(struct net memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len); memcpy(adapter->hw.mac_addr, addr->sa_data, netdev->addr_len); @@ -17,7 +17,7 @@ v2.6.36-rc1~571^2~104 atl1c_hw_set_mac_addr(&adapter->hw, adapter->hw.mac_addr); -@@ -2570,7 +2572,9 @@ static int __devinit atl1c_probe(struct +@@ -2569,7 +2571,9 @@ static int __devinit atl1c_probe(struct } if (atl1c_read_mac_addr(&adapter->hw)) { /* got a random MAC address, set NET_ADDR_RANDOM to netdev */ -- 2.30.2