From: Luis R. Rodriguez Date: Thu, 9 Dec 2010 22:29:18 +0000 (-0800) Subject: compat-wireless: refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b9928964ed4c9ecae4f9da6246f90e16a97ce9f4;p=openwrt%2Fstaging%2Fblogic.git compat-wireless: refresh patches Signed-off-by: Luis R. Rodriguez --- diff --git a/patches/01-netdev.patch b/patches/01-netdev.patch index fd0139e28f27..054e34b36b9b 100644 --- a/patches/01-netdev.patch +++ b/patches/01-netdev.patch @@ -267,7 +267,7 @@ without creating a headache on maintenance of the pathes. dev->tx_queue_len = 0; --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c -@@ -2266,14 +2266,18 @@ int orinoco_if_add(struct orinoco_privat +@@ -2272,14 +2272,18 @@ int orinoco_if_add(struct orinoco_privat #endif /* Default to standard ops if not set */ if (ops) diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 4b17ca05bd19..060bb5b6c88d 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch @@ -6,7 +6,7 @@ files... --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -4040,7 +4040,9 @@ static int nl80211_wiphy_netns(struct sk +@@ -4045,7 +4045,9 @@ static int nl80211_wiphy_netns(struct sk if (!net_eq(wiphy_net(&rdev->wiphy), net)) err = cfg80211_switch_netns(rdev, net); diff --git a/patches/05-usb.patch b/patches/05-usb.patch index 66f6d9842b81..4f0b9f3e16c8 100644 --- a/patches/05-usb.patch +++ b/patches/05-usb.patch @@ -14,7 +14,7 @@ USB opt soft_unbid was added as of 2.6.27. static int __init p54u_init(void) --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1066,7 +1066,9 @@ static struct usb_driver ath9k_hif_usb_d +@@ -1073,7 +1073,9 @@ static struct usb_driver ath9k_hif_usb_d .reset_resume = ath9k_hif_usb_resume, #endif .id_table = ath9k_hif_usb_ids, diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 992a60af13cb..060d9acd829e 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch @@ -6,7 +6,7 @@ thread in process context as well. --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c -@@ -3946,8 +3946,13 @@ redo: +@@ -3952,8 +3952,13 @@ redo: if (dev->dev->bus->bustype == SSB_BUSTYPE_SDIO) { b43_sdio_free_irq(dev); } else { @@ -20,7 +20,7 @@ thread in process context as well. } mutex_lock(&wl->mutex); dev = wl->current_dev; -@@ -3987,9 +3992,17 @@ static int b43_wireless_core_start(struc +@@ -3993,9 +3998,17 @@ static int b43_wireless_core_start(struc goto out; } } else { @@ -38,7 +38,7 @@ thread in process context as well. if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq); goto out; -@@ -4718,6 +4731,10 @@ static int b43_setup_bands(struct b43_wl +@@ -4724,6 +4737,10 @@ static int b43_setup_bands(struct b43_wl static void b43_wireless_core_detach(struct b43_wldev *dev) { diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index 78a71ca15d7f..e528e9920944 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -99,7 +99,7 @@ here still, but for now we keep this here. #include --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c -@@ -566,7 +566,11 @@ drop: +@@ -598,7 +598,11 @@ drop: goto done; } @@ -111,7 +111,7 @@ here still, but for now we keep this here. { struct hci_ufilter uf = { .opcode = 0 }; struct sock *sk = sock->sk; -@@ -721,8 +725,12 @@ static struct proto hci_sk_proto = { +@@ -753,8 +757,12 @@ static struct proto hci_sk_proto = { .obj_size = sizeof(struct hci_pinfo) }; diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 88de16b0c769..a0acde933799 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch @@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() ieee80211_set_qos_hdr(local, skb); ieee80211_tx(sdata, skb, false); rcu_read_unlock(); -@@ -2110,7 +2114,14 @@ void ieee80211_tx_pending(unsigned long +@@ -2125,7 +2129,14 @@ void ieee80211_tx_pending(unsigned long if (skb_queue_empty(&local->pending[i])) list_for_each_entry_rcu(sdata, &local->interfaces, list) diff --git a/patches/25-multicast-list_head.patch b/patches/25-multicast-list_head.patch index f023114efa33..09099ffc3bcc 100644 --- a/patches/25-multicast-list_head.patch +++ b/patches/25-multicast-list_head.patch @@ -162,7 +162,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 } --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c -@@ -3119,20 +3119,42 @@ unlock: +@@ -3122,20 +3122,42 @@ unlock: } static u64 ath5k_prepare_multicast(struct ieee80211_hw *hw, @@ -205,7 +205,7 @@ This also backport commit 2f787b0b76bf5de2eaa3ca3a29d89123ae03c856 pos ^= (val >> 18) ^ (val >> 12) ^ (val >> 6) ^ val; pos &= 0x3f; mfilt[pos / 32] |= (1 << (pos % 32)); -@@ -3141,6 +3163,9 @@ static u64 ath5k_prepare_multicast(struc +@@ -3144,6 +3166,9 @@ static u64 ath5k_prepare_multicast(struc * neet to inform below to not reset the mcast */ /* ath5k_hw_set_mcast_filterindex(ah, * ha->addr[5]); */ diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index 9ea04bbd166c..34964ee30523 100644 --- a/patches/30-bridge-port.patch +++ b/patches/30-bridge-port.patch @@ -34,7 +34,7 @@ compat-wireless. ntype == NL80211_IFTYPE_P2P_CLIENT)) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1281,7 +1281,7 @@ static int nl80211_valid_4addr(struct cf +@@ -1282,7 +1282,7 @@ static int nl80211_valid_4addr(struct cf enum nl80211_iftype iftype) { if (!use_4addr) {