From: Luis R. Rodriguez Date: Tue, 18 Sep 2012 23:01:54 +0000 (-0700) Subject: compat-drivers: refresh patches for next-20120918 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a235ad292e381e4d57cdabb5f04721fba200c075;p=openwrt%2Fstaging%2Fblogic.git compat-drivers: refresh patches for next-20120918 Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/network/0001-netdev_ops.patch b/patches/network/0001-netdev_ops.patch index a3dc91ac78cf..0f84c6ba3d19 100644 --- a/patches/network/0001-netdev_ops.patch +++ b/patches/network/0001-netdev_ops.patch @@ -71,7 +71,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3439,7 +3439,7 @@ static int rndis_wlan_bind(struct usbnet +@@ -3436,7 +3436,7 @@ static int rndis_wlan_bind(struct usbnet * rndis_host wants to avoid all OID as much as possible * so do promisc/multicast handling in rndis_wlan. */ @@ -124,7 +124,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 net_dev->wireless_handlers = &ipw_wx_handler_def; --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c -@@ -991,7 +991,7 @@ struct lbs_private *lbs_add_card(void *c +@@ -993,7 +993,7 @@ struct lbs_private *lbs_add_card(void *c wdev->netdev = dev; priv->dev = dev; @@ -157,7 +157,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 dev->tx_queue_len = 0; --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -639,7 +639,7 @@ static const struct net_device_ops mwifi +@@ -638,7 +638,7 @@ static const struct net_device_ops mwifi void mwifiex_init_priv_params(struct mwifiex_private *priv, struct net_device *dev) { diff --git a/patches/network/0005-netlink-portid.patch b/patches/network/0005-netlink-portid.patch index 866900150dac..e299640cb77c 100644 --- a/patches/network/0005-netlink-portid.patch +++ b/patches/network/0005-netlink-portid.patch @@ -183,7 +183,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_NEW_SCAN_RESULTS); if (!hdr) return -1; -@@ -4838,7 +4838,7 @@ static int nl80211_dump_survey(struct sk +@@ -4836,7 +4836,7 @@ static int nl80211_dump_survey(struct sk } if (nl80211_send_survey(skb, @@ -192,7 +192,7 @@ this one should other drivers / subsystem need this change. cb->nlh->nlmsg_seq, NLM_F_MULTI, netdev, &survey) < 0) -@@ -5453,7 +5453,7 @@ static int nl80211_testmode_dump(struct +@@ -5451,7 +5451,7 @@ static int nl80211_testmode_dump(struct } while (1) { @@ -201,7 +201,7 @@ this one should other drivers / subsystem need this change. cb->nlh->nlmsg_seq, NLM_F_MULTI, NL80211_CMD_TESTMODE); struct nlattr *tmdata; -@@ -5533,7 +5533,7 @@ struct sk_buff *cfg80211_testmode_alloc_ +@@ -5531,7 +5531,7 @@ struct sk_buff *cfg80211_testmode_alloc_ return NULL; return __cfg80211_testmode_alloc_skb(rdev, approxlen, @@ -210,7 +210,7 @@ this one should other drivers / subsystem need this change. rdev->testmode_info->snd_seq, GFP_KERNEL); } -@@ -5873,7 +5873,7 @@ static int nl80211_remain_on_channel(str +@@ -5869,7 +5869,7 @@ static int nl80211_remain_on_channel(str if (!msg) return -ENOMEM; @@ -219,7 +219,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_REMAIN_ON_CHANNEL); if (IS_ERR(hdr)) { -@@ -6092,7 +6092,7 @@ static int nl80211_register_mgmt(struct +@@ -6088,7 +6088,7 @@ static int nl80211_register_mgmt(struct if (!rdev->ops->mgmt_tx) return -EOPNOTSUPP; @@ -228,7 +228,7 @@ this one should other drivers / subsystem need this change. nla_data(info->attrs[NL80211_ATTR_FRAME_MATCH]), nla_len(info->attrs[NL80211_ATTR_FRAME_MATCH])); } -@@ -6173,7 +6173,7 @@ static int nl80211_tx_mgmt(struct sk_buf +@@ -6169,7 +6169,7 @@ static int nl80211_tx_mgmt(struct sk_buf if (!msg) return -ENOMEM; @@ -237,7 +237,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_FRAME); if (IS_ERR(hdr)) { -@@ -6290,7 +6290,7 @@ static int nl80211_get_power_save(struct +@@ -6286,7 +6286,7 @@ static int nl80211_get_power_save(struct if (!msg) return -ENOMEM; @@ -246,7 +246,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_GET_POWER_SAVE); if (!hdr) { err = -ENOBUFS; -@@ -6492,7 +6492,7 @@ static int nl80211_get_wowlan(struct sk_ +@@ -6488,7 +6488,7 @@ static int nl80211_get_wowlan(struct sk_ if (!msg) return -ENOMEM; @@ -255,7 +255,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_GET_WOWLAN); if (!hdr) goto nla_put_failure; -@@ -6769,7 +6769,7 @@ static int nl80211_register_unexpected_f +@@ -6765,7 +6765,7 @@ static int nl80211_register_unexpected_f if (wdev->ap_unexpected_nlportid) return -EBUSY; @@ -264,7 +264,7 @@ this one should other drivers / subsystem need this change. return 0; } -@@ -6799,7 +6799,7 @@ static int nl80211_probe_client(struct s +@@ -6795,7 +6795,7 @@ static int nl80211_probe_client(struct s if (!msg) return -ENOMEM; @@ -273,7 +273,7 @@ this one should other drivers / subsystem need this change. NL80211_CMD_PROBE_CLIENT); if (IS_ERR(hdr)) { -@@ -6837,7 +6837,7 @@ static int nl80211_register_beacons(stru +@@ -6833,7 +6833,7 @@ static int nl80211_register_beacons(stru if (rdev->ap_beacons_nlportid) return -EBUSY; @@ -282,7 +282,7 @@ this one should other drivers / subsystem need this change. return 0; } -@@ -8859,8 +8859,8 @@ static int nl80211_netlink_notify(struct +@@ -8855,8 +8855,8 @@ static int nl80211_netlink_notify(struct list_for_each_entry_rcu(rdev, &cfg80211_rdev_list, list) { list_for_each_entry_rcu(wdev, &rdev->wdev_list, list) diff --git a/patches/network/11-dev-pm-ops.patch b/patches/network/11-dev-pm-ops.patch index 45bfe0a04d9a..0b80da1910d3 100644 --- a/patches/network/11-dev-pm-ops.patch +++ b/patches/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 -@@ -2691,6 +2691,9 @@ static struct pci_error_handlers atl1c_e +@@ -2691,6 +2691,9 @@ static const struct pci_error_handlers a .resume = atl1c_io_resume, }; @@ -109,7 +109,7 @@ calls on compat code with only slight modifications. module_pci_driver(ath5k_pci_driver); --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c -@@ -336,14 +336,10 @@ static int ath_pci_resume(struct device +@@ -337,14 +337,10 @@ static int ath_pci_resume(struct device return 0; } @@ -128,7 +128,7 @@ calls on compat code with only slight modifications. #define ATH9K_PM_OPS (&ath9k_pm_ops) -@@ -361,7 +357,12 @@ static struct pci_driver ath_pci_driver +@@ -362,7 +358,12 @@ static struct pci_driver ath_pci_driver .id_table = ath_pci_id_table, .probe = ath_pci_probe, .remove = ath_pci_remove, @@ -263,7 +263,7 @@ calls on compat code with only slight modifications. --- a/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/sw.c -@@ -372,21 +372,22 @@ MODULE_PARM_DESC(swlps, "Set to 1 to use +@@ -374,21 +374,22 @@ 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)"); diff --git a/patches/network/25-multicast-list_head.patch b/patches/network/25-multicast-list_head.patch index d8caa2c37f60..a1da31136042 100644 --- a/patches/network/25-multicast-list_head.patch +++ b/patches/network/25-multicast-list_head.patch @@ -435,7 +435,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 size_t fw_name_len, u32 *hw_ver); --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c -@@ -363,11 +363,18 @@ out: +@@ -364,11 +364,18 @@ out: return ret; } @@ -454,7 +454,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 int i; BUILD_BUG_ON(ARRAY_SIZE(priv->mc_maclist) != -@@ -377,12 +384,23 @@ static u64 p54_prepare_multicast(struct +@@ -378,12 +385,23 @@ static u64 p54_prepare_multicast(struct * Otherwise the firmware will drop it and ARP will no longer work. */ i = 1; diff --git a/patches/network/62-usb_driver_lpm.patch b/patches/network/62-usb_driver_lpm.patch index 286164c610fa..37f211273cb9 100644 --- a/patches/network/62-usb_driver_lpm.patch +++ b/patches/network/62-usb_driver_lpm.patch @@ -84,7 +84,7 @@ module_usb_driver(rndis_driver); --- a/drivers/net/wireless/at76c50x-usb.c +++ b/drivers/net/wireless/at76c50x-usb.c -@@ -2488,7 +2488,9 @@ static struct usb_driver at76_driver = { +@@ -2458,7 +2458,9 @@ static struct usb_driver at76_driver = { .probe = at76_probe, .disconnect = at76_disconnect, .id_table = dev_table, @@ -132,7 +132,7 @@ module_usb_driver(carl9170_driver); --- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c -@@ -1625,7 +1625,9 @@ static struct usb_driver brcmf_usbdrvr = +@@ -1593,7 +1593,9 @@ static struct usb_driver brcmf_usbdrvr = .suspend = brcmf_usb_suspend, .resume = brcmf_usb_resume, .supports_autosuspend = 1, @@ -192,7 +192,7 @@ module_usb_driver(p54u_driver); --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3758,7 +3758,9 @@ static struct usb_driver rndis_wlan_driv +@@ -3755,7 +3755,9 @@ static struct usb_driver rndis_wlan_driv .disconnect = usbnet_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume,