From: Luis R. Rodriguez Date: Thu, 17 May 2012 03:38:48 +0000 (-0700) Subject: compat-wireless: refresh patches for next-20120516 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a50389d733f22217e0742c266bd81f6ccf70f0d4;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh patches for next-20120516 Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/0001-netdev_ops.patch b/patches/0001-netdev_ops.patch index 02f505845885..2770dc19e23d 100644 --- a/patches/0001-netdev_ops.patch +++ b/patches/0001-netdev_ops.patch @@ -38,7 +38,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c -@@ -355,7 +355,7 @@ generic_rndis_bind(struct usbnet *dev, s +@@ -358,7 +358,7 @@ generic_rndis_bind(struct usbnet *dev, s dev->rx_urb_size &= ~(dev->maxpacket - 1); u.init->max_transfer_size = cpu_to_le32(dev->rx_urb_size); @@ -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 -@@ -1388,7 +1388,7 @@ usbnet_probe (struct usb_interface *udev +@@ -1410,7 +1410,7 @@ usbnet_probe (struct usb_interface *udev net->features |= NETIF_F_HIGHDMA; #endif @@ -71,15 +71,15 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -3463,7 +3463,7 @@ static int rndis_wlan_bind(struct usbnet +@@ -3450,7 +3450,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. */ - usbdev->net->netdev_ops = &rndis_wlan_netdev_ops; + netdev_attach_ops(usbdev->net, &rndis_wlan_netdev_ops); - tmp = RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST; - retval = rndis_set_oid(usbdev, OID_GEN_CURRENT_PACKET_FILTER, &tmp, + tmp = cpu_to_le32(RNDIS_PACKET_TYPE_DIRECTED | RNDIS_PACKET_TYPE_BROADCAST); + retval = rndis_set_oid(usbdev, --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -2159,7 +2159,7 @@ static int __devinit b44_init_one(struct @@ -157,7 +157,7 @@ Date: Wed Nov 19 21:32:24 2008 -0800 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c -@@ -1290,7 +1290,7 @@ static const struct net_device_ops hwsim +@@ -1295,7 +1295,7 @@ static const struct net_device_ops hwsim static void hwsim_mon_setup(struct net_device *dev) { diff --git a/patches/0002-net-misc.patch b/patches/0002-net-misc.patch index e373a23bde32..0930a556d84d 100644 --- a/patches/0002-net-misc.patch +++ b/patches/0002-net-misc.patch @@ -8,7 +8,7 @@ compile tested against older kernels. --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c -@@ -329,6 +329,11 @@ generic_rndis_bind(struct usbnet *dev, s +@@ -332,6 +332,11 @@ generic_rndis_bind(struct usbnet *dev, s u.init->major_version = cpu_to_le32(1); u.init->minor_version = cpu_to_le32(0); diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 357de09340cf..274da971eb2d 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -63,7 +63,7 @@ thread in process context as well. /* Data structure for the WLAN parts (802.11 cores) of the b43 chip. */ --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -4986,14 +4986,25 @@ int __devinit wlcore_probe(struct wl1271 +@@ -5287,14 +5287,25 @@ int __devinit wlcore_probe(struct wl1271 platform_set_drvdata(pdev, wl); @@ -89,7 +89,7 @@ thread in process context as well. if (ret < 0) { wl1271_error("request_irq() failed: %d", ret); goto out_free_hw; -@@ -5047,7 +5058,11 @@ out_bt_coex_state: +@@ -5353,7 +5364,11 @@ out_bt_coex_state: device_remove_file(wl->dev, &dev_attr_bt_coex_state); out_irq: @@ -101,7 +101,7 @@ thread in process context as well. out_free_hw: wlcore_free_hw(wl); -@@ -5066,7 +5081,12 @@ int __devexit wlcore_remove(struct platf +@@ -5372,7 +5387,12 @@ int __devexit wlcore_remove(struct platf disable_irq_wake(wl->irq); } wl1271_unregister_hw(wl); diff --git a/patches/12-mac80211-disable-tx-status.patch b/patches/12-mac80211-disable-tx-status.patch index 423ed0a955e1..f2db1c83b0f2 100644 --- a/patches/12-mac80211-disable-tx-status.patch +++ b/patches/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 -@@ -1977,6 +1977,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -1972,6 +1972,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s goto fail; } @@ -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; -@@ -2015,6 +2016,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2010,6 +2011,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s skb = orig_skb; } } diff --git a/patches/14-device-type.patch b/patches/14-device-type.patch index 9a752ea1296e..fbc9029094df 100644 --- a/patches/14-device-type.patch +++ b/patches/14-device-type.patch @@ -36,7 +36,7 @@ compile warning. { --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1303,13 +1303,17 @@ static const struct net_device_ops usbne +@@ -1325,13 +1325,17 @@ static const struct net_device_ops usbne // precondition: never called in_interrupt diff --git a/patches/15-symbol-export-conflicts.patch b/patches/15-symbol-export-conflicts.patch index 6f9bc7f70fb7..df428adaa44e 100644 --- a/patches/15-symbol-export-conflicts.patch +++ b/patches/15-symbol-export-conflicts.patch @@ -3,7 +3,7 @@ To avoid conflicts with the other export we rename our. --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -3102,7 +3102,12 @@ void ieee80211_rx(struct ieee80211_hw *h +@@ -3101,7 +3101,12 @@ void ieee80211_rx(struct ieee80211_hw *h drop: kfree_skb(skb); } diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index e8d29c01e21f..8c58f1e61467 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -547,7 +547,7 @@ here still, but for now we keep this here. { struct sock *sk = sock->sk; struct l2cap_chan *chan = l2cap_pi(sk)->chan; -@@ -1067,8 +1074,12 @@ static struct sock *l2cap_sock_alloc(str +@@ -1071,8 +1078,12 @@ static struct sock *l2cap_sock_alloc(str return sk; } @@ -560,7 +560,7 @@ here still, but for now we keep this here. { struct sock *sk; -@@ -1080,7 +1091,11 @@ static int l2cap_sock_create(struct net +@@ -1084,7 +1095,11 @@ static int l2cap_sock_create(struct net sock->type != SOCK_DGRAM && sock->type != SOCK_RAW) return -ESOCKTNOSUPPORT; diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 9249b663fd41..0dac231ffbce 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -30,7 +30,7 @@ in compat. --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1498,6 +1498,10 @@ void ieee80211_xmit(struct ieee80211_sub +@@ -1495,6 +1495,10 @@ void ieee80211_xmit(struct ieee80211_sub return; } diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index 2221c40230d0..84239a18e88e 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -480,7 +480,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 return 1; /* update */ --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c -@@ -1661,7 +1661,11 @@ static void set_multicast_list(struct us +@@ -1633,7 +1633,11 @@ static void set_multicast_list(struct us netdev_for_each_mc_addr(ha, usbdev->net) memcpy(mc_addrs + i++ * ETH_ALEN, @@ -536,7 +536,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 static void rtl8187_configure_filter(struct ieee80211_hw *dev, --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c -@@ -2358,11 +2358,20 @@ struct wl1271_filter_params { +@@ -2626,11 +2626,20 @@ struct wl1271_filter_params { u8 mc_list[ACX_MC_ADDRESS_GROUP_MAX][ETH_ALEN]; }; @@ -557,7 +557,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 struct wl1271 *wl = hw->priv; if (unlikely(wl->state == WL1271_STATE_OFF)) -@@ -2375,16 +2384,40 @@ static u64 wl1271_op_prepare_multicast(s +@@ -2643,16 +2652,40 @@ static u64 wl1271_op_prepare_multicast(s } /* update multicast filtering parameters */ diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index c276d3822791..779cef38bf21 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch @@ -151,7 +151,7 @@ suspend and resume that are not backported. int retry = 0; while (atomic_read(&sdiodev->suspend) && retry++ != 30) wait_event_timeout(*wq, false, HZ/100); -@@ -589,7 +589,7 @@ static void brcmf_ops_sdio_remove(struct +@@ -563,7 +563,7 @@ static void brcmf_ops_sdio_remove(struct } } @@ -160,7 +160,7 @@ suspend and resume that are not backported. static int brcmf_sdio_suspend(struct device *dev) { mmc_pm_flag_t sdio_flags; -@@ -639,7 +639,7 @@ static struct sdio_driver brcmf_sdmmc_dr +@@ -613,7 +613,7 @@ static struct sdio_driver brcmf_sdmmc_dr .remove = brcmf_ops_sdio_remove, .name = "brcmfmac", .id_table = brcmf_sdmmc_ids, diff --git a/patches/48-use_skb_get_queue_mapping.patch b/patches/48-use_skb_get_queue_mapping.patch index 4906773d502b..811522691f16 100644 --- a/patches/48-use_skb_get_queue_mapping.patch +++ b/patches/48-use_skb_get_queue_mapping.patch @@ -21,7 +21,7 @@ function always returns something. --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c -@@ -2505,11 +2505,11 @@ static void b43legacy_op_tx(struct ieee8 +@@ -2503,11 +2503,11 @@ static void b43legacy_op_tx(struct ieee8 } B43legacy_WARN_ON(skb_shinfo(skb)->nr_frags); diff --git a/patches/54-get_ts_info.patch b/patches/54-get_ts_info.patch index 057cd07184c2..5e842dfdbda4 100644 --- a/patches/54-get_ts_info.patch +++ b/patches/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 -@@ -885,7 +885,9 @@ static const struct ethtool_ops usbnet_e +@@ -909,7 +909,9 @@ static const struct ethtool_ops usbnet_e .get_drvinfo = usbnet_get_drvinfo, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel,