From d6ed4a46fec0fa02235f6a4e6ea2c27546c5f86d Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 5 Apr 2013 18:14:56 +0200 Subject: [PATCH] rediff patches against next-20130404 With the previous two patches, next-20130404 passes ckmake --allyesconfig. Signed-off-by: Johannes Berg --- .../drivers_net_ethernet_atheros_atl1e_atl1e_main.patch | 2 +- .../drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch | 4 ++-- .../drivers_net_wireless_rtlwifi_rtl8192se_sw.patch | 4 ++-- .../network/16-bluetooth/net_bluetooth_af_bluetooth.patch | 2 +- .../25-multicast-list_head/net_mac80211_ieee80211_i.h | 2 +- ...ivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch | 2 +- .../drivers_net_ethernet_atheros_atl1e_atl1e_main.patch | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch index 9c798eccab22..e359e8728bac 100644 --- a/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +++ b/patches/collateral-evolutions/network/0001-netdev_ops/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch @@ -1,6 +1,6 @@ --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c -@@ -2207,7 +2207,7 @@ static int atl1e_init_netdev(struct net_ +@@ -2192,7 +2192,7 @@ static int atl1e_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/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch index e297248b91bf..6de2fe7164ab 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192ce_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -@@ -372,6 +372,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -374,6 +374,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); static struct pci_driver rtl92ce_driver = { -@@ -379,7 +382,12 @@ static struct pci_driver rtl92ce_driver +@@ -381,7 +384,12 @@ static struct pci_driver rtl92ce_driver .id_table = rtl92ce_pci_ids, .probe = rtl_pci_probe, .remove = rtl_pci_disconnect, diff --git a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch index 52225549a743..9e08679efaf2 100644 --- a/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch +++ b/patches/collateral-evolutions/network/11-dev-pm-ops/drivers_net_wireless_rtlwifi_rtl8192se_sw.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/rtlwifi/rtl8192se/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192se/sw.c -@@ -429,6 +429,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -430,6 +430,9 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use MODULE_PARM_DESC(fwlps, "Set to 1 to use FW control power save (default 1)\n"); MODULE_PARM_DESC(debug, "Set debug level (0-5) (default 0)"); @@ -10,7 +10,7 @@ static SIMPLE_DEV_PM_OPS(rtlwifi_pm_ops, rtl_pci_suspend, rtl_pci_resume); static struct pci_driver rtl92se_driver = { -@@ -436,7 +439,12 @@ static struct pci_driver rtl92se_driver +@@ -437,7 +440,12 @@ static struct pci_driver rtl92se_driver .id_table = rtl92se_pci_ids, .probe = rtl_pci_probe, .remove = rtl_pci_disconnect, diff --git a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch index 8607e2eadf63..92852d3b57c8 100644 --- a/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch +++ b/patches/collateral-evolutions/network/16-bluetooth/net_bluetooth_af_bluetooth.patch @@ -25,7 +25,7 @@ if (!err) bt_sock_reclassify_lock(sock->sk, proto); module_put(bt_proto[proto]->owner); -@@ -455,7 +463,11 @@ int bt_sock_ioctl(struct socket *sock, u +@@ -456,7 +464,11 @@ int bt_sock_ioctl(struct socket *sock, u if (sk->sk_state == BT_LISTEN) return -EINVAL; diff --git a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h index 629007d17c3c..5936ffbeb7a2 100644 --- a/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h +++ b/patches/collateral-evolutions/network/25-multicast-list_head/net_mac80211_ieee80211_i.h @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -907,7 +907,12 @@ struct ieee80211_local { +@@ -908,7 +908,12 @@ struct ieee80211_local { struct work_struct reconfig_filter; /* aggregated multicast list */ diff --git a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch index 310dee213a41..f0b854448c95 100644 --- a/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch +++ b/patches/collateral-evolutions/network/29-sdio_no_suspend/drivers_net_wireless_brcm80211_brcmfmac_bcmsdh_sdmmc.patch @@ -19,7 +19,7 @@ while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); @@ -546,7 +546,7 @@ static void brcmf_ops_sdio_remove(struct - brcmf_dbg(TRACE, "Exit\n"); + brcmf_dbg(SDIO, "Exit\n"); } -#ifdef CONFIG_PM_SLEEP diff --git a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch index d19d43a5b744..04eeb512cb46 100644 --- a/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch +++ b/patches/collateral-evolutions/network/40-netdev-hw-features/drivers_net_ethernet_atheros_atl1e_atl1e_main.patch @@ -16,7 +16,7 @@ /** * atl1e_change_mtu - Change the Maximum Transfer Unit -@@ -1925,7 +1927,11 @@ void atl1e_down(struct atl1e_adapter *ad +@@ -1910,7 +1912,11 @@ void atl1e_down(struct atl1e_adapter *ad * reschedule our watchdog timer */ set_bit(__AT_DOWN, &adapter->flags); @@ -28,7 +28,7 @@ /* reset MAC to disable all RX/TX */ atl1e_reset_hw(&adapter->hw); -@@ -2195,8 +2201,10 @@ static const struct net_device_ops atl1e +@@ -2180,8 +2186,10 @@ static const struct net_device_ops atl1e .ndo_set_rx_mode = atl1e_set_multi, .ndo_validate_addr = eth_validate_addr, .ndo_set_mac_address = atl1e_set_mac_addr, @@ -39,7 +39,7 @@ .ndo_change_mtu = atl1e_change_mtu, .ndo_do_ioctl = atl1e_ioctl, .ndo_tx_timeout = atl1e_tx_timeout, -@@ -2216,10 +2224,15 @@ static int atl1e_init_netdev(struct net_ +@@ -2201,10 +2209,15 @@ static int atl1e_init_netdev(struct net_ netdev->watchdog_timeo = AT_TX_WATCHDOG; atl1e_set_ethtool_ops(netdev); -- 2.30.2