diff options
author | Luis R. Rodriguez | 2011-08-22 10:08:05 -0500 |
---|---|---|
committer | Luis R. Rodriguez | 2011-08-22 10:08:05 -0500 |
commit | 3e4dd06986d10d3f74247e27953ab09dc86d2bbd (patch) | |
tree | 30bdf37e64672ff044e033cad58789b947ac9127 /patches | |
parent | 640ae1f6497fa1467adb8fc1089398532fba2a0a (diff) | |
download | compat-wireless-3e4dd06986d10d3f74247e27953ab09dc86d2bbd.tar.gz compat-wireless-3e4dd06986d10d3f74247e27953ab09dc86d2bbd.tar.xz compat-wireless-3e4dd06986d10d3f74247e27953ab09dc86d2bbd.zip |
compat-wireless: refresh patches
Signed-off-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/04-netns.patch | 2 | ||||
-rw-r--r-- | patches/09-threaded-irq.patch | 6 | ||||
-rw-r--r-- | patches/21-capi-proc_fops.patch | 6 | ||||
-rw-r--r-- | patches/22-multiqueue.patch | 8 | ||||
-rw-r--r-- | patches/26-sdio-quirks.patch | 6 | ||||
-rw-r--r-- | patches/29-sdio_no_suspend.patch | 4 | ||||
-rw-r--r-- | patches/30-bridge-port.patch | 4 | ||||
-rw-r--r-- | patches/40-netdev-hw-features.patch | 4 | ||||
-rw-r--r-- | patches/42-netlink_seq.patch | 2 |
9 files changed, 21 insertions, 21 deletions
diff --git a/patches/04-netns.patch b/patches/04-netns.patch index 14c679b..96392a9 100644 --- a/patches/04-netns.patch +++ b/patches/04-netns.patch | |||
@@ -6,7 +6,7 @@ files... | |||
6 | 6 | ||
7 | --- a/net/wireless/nl80211.c | 7 | --- a/net/wireless/nl80211.c |
8 | +++ b/net/wireless/nl80211.c | 8 | +++ b/net/wireless/nl80211.c |
9 | @@ -4714,7 +4714,9 @@ static int nl80211_wiphy_netns(struct sk | 9 | @@ -4794,7 +4794,9 @@ static int nl80211_wiphy_netns(struct sk |
10 | if (!net_eq(wiphy_net(&rdev->wiphy), net)) | 10 | if (!net_eq(wiphy_net(&rdev->wiphy), net)) |
11 | err = cfg80211_switch_netns(rdev, net); | 11 | err = cfg80211_switch_netns(rdev, net); |
12 | 12 | ||
diff --git a/patches/09-threaded-irq.patch b/patches/09-threaded-irq.patch index 5a18b88..cc8c5d4 100644 --- a/patches/09-threaded-irq.patch +++ b/patches/09-threaded-irq.patch | |||
@@ -6,7 +6,7 @@ thread in process context as well. | |||
6 | 6 | ||
7 | --- a/drivers/net/wireless/b43/main.c | 7 | --- a/drivers/net/wireless/b43/main.c |
8 | +++ b/drivers/net/wireless/b43/main.c | 8 | +++ b/drivers/net/wireless/b43/main.c |
9 | @@ -4143,8 +4143,13 @@ redo: | 9 | @@ -4144,8 +4144,13 @@ redo: |
10 | if (b43_bus_host_is_sdio(dev->dev)) { | 10 | if (b43_bus_host_is_sdio(dev->dev)) { |
11 | b43_sdio_free_irq(dev); | 11 | b43_sdio_free_irq(dev); |
12 | } else { | 12 | } else { |
@@ -20,7 +20,7 @@ thread in process context as well. | |||
20 | } | 20 | } |
21 | mutex_lock(&wl->mutex); | 21 | mutex_lock(&wl->mutex); |
22 | dev = wl->current_dev; | 22 | dev = wl->current_dev; |
23 | @@ -4184,9 +4189,17 @@ static int b43_wireless_core_start(struc | 23 | @@ -4185,9 +4190,17 @@ static int b43_wireless_core_start(struc |
24 | goto out; | 24 | goto out; |
25 | } | 25 | } |
26 | } else { | 26 | } else { |
@@ -38,7 +38,7 @@ thread in process context as well. | |||
38 | if (err) { | 38 | if (err) { |
39 | b43err(dev->wl, "Cannot request IRQ-%d\n", | 39 | b43err(dev->wl, "Cannot request IRQ-%d\n", |
40 | dev->dev->irq); | 40 | dev->dev->irq); |
41 | @@ -4956,6 +4969,10 @@ static int b43_setup_bands(struct b43_wl | 41 | @@ -4957,6 +4970,10 @@ static int b43_setup_bands(struct b43_wl |
42 | 42 | ||
43 | static void b43_wireless_core_detach(struct b43_wldev *dev) | 43 | static void b43_wireless_core_detach(struct b43_wldev *dev) |
44 | { | 44 | { |
diff --git a/patches/21-capi-proc_fops.patch b/patches/21-capi-proc_fops.patch index 2f2ca7d..9cd9f4c 100644 --- a/patches/21-capi-proc_fops.patch +++ b/patches/21-capi-proc_fops.patch | |||
@@ -14,7 +14,7 @@ proc_fops: convert drivers/isdn/ to seq_file | |||
14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
17 | @@ -521,6 +523,7 @@ static char *cmtp_procinfo(struct capi_c | 17 | @@ -522,6 +524,7 @@ static char *cmtp_procinfo(struct capi_c |
18 | return "CAPI Message Transport Protocol"; | 18 | return "CAPI Message Transport Protocol"; |
19 | } | 19 | } |
20 | 20 | ||
@@ -22,7 +22,7 @@ proc_fops: convert drivers/isdn/ to seq_file | |||
22 | static int cmtp_proc_show(struct seq_file *m, void *v) | 22 | static int cmtp_proc_show(struct seq_file *m, void *v) |
23 | { | 23 | { |
24 | struct capi_ctr *ctrl = m->private; | 24 | struct capi_ctr *ctrl = m->private; |
25 | @@ -553,6 +556,36 @@ static const struct file_operations cmtp | 25 | @@ -554,6 +557,36 @@ static const struct file_operations cmtp |
26 | .release = single_release, | 26 | .release = single_release, |
27 | }; | 27 | }; |
28 | 28 | ||
@@ -59,7 +59,7 @@ proc_fops: convert drivers/isdn/ to seq_file | |||
59 | int cmtp_attach_device(struct cmtp_session *session) | 59 | int cmtp_attach_device(struct cmtp_session *session) |
60 | { | 60 | { |
61 | unsigned char buf[4]; | 61 | unsigned char buf[4]; |
62 | @@ -591,7 +624,11 @@ int cmtp_attach_device(struct cmtp_sessi | 62 | @@ -592,7 +625,11 @@ int cmtp_attach_device(struct cmtp_sessi |
63 | session->ctrl.send_message = cmtp_send_message; | 63 | session->ctrl.send_message = cmtp_send_message; |
64 | 64 | ||
65 | session->ctrl.procinfo = cmtp_procinfo; | 65 | session->ctrl.procinfo = cmtp_procinfo; |
diff --git a/patches/22-multiqueue.patch b/patches/22-multiqueue.patch index 17724ac..ef8a6e8 100644 --- a/patches/22-multiqueue.patch +++ b/patches/22-multiqueue.patch | |||
@@ -46,7 +46,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() | |||
46 | 46 | ||
47 | --- a/net/mac80211/util.c | 47 | --- a/net/mac80211/util.c |
48 | +++ b/net/mac80211/util.c | 48 | +++ b/net/mac80211/util.c |
49 | @@ -264,6 +264,18 @@ __le16 ieee80211_ctstoself_duration(stru | 49 | @@ -263,6 +263,18 @@ __le16 ieee80211_ctstoself_duration(stru |
50 | } | 50 | } |
51 | EXPORT_SYMBOL(ieee80211_ctstoself_duration); | 51 | EXPORT_SYMBOL(ieee80211_ctstoself_duration); |
52 | 52 | ||
@@ -65,7 +65,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() | |||
65 | static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, | 65 | static void __ieee80211_wake_queue(struct ieee80211_hw *hw, int queue, |
66 | enum queue_stop_reason reason) | 66 | enum queue_stop_reason reason) |
67 | { | 67 | { |
68 | @@ -286,7 +298,14 @@ static void __ieee80211_wake_queue(struc | 68 | @@ -285,7 +297,14 @@ static void __ieee80211_wake_queue(struc |
69 | list_for_each_entry_rcu(sdata, &local->interfaces, list) { | 69 | list_for_each_entry_rcu(sdata, &local->interfaces, list) { |
70 | if (test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) | 70 | if (test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) |
71 | continue; | 71 | continue; |
@@ -80,7 +80,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() | |||
80 | } | 80 | } |
81 | rcu_read_unlock(); | 81 | rcu_read_unlock(); |
82 | } else | 82 | } else |
83 | @@ -326,7 +345,13 @@ static void __ieee80211_stop_queue(struc | 83 | @@ -325,7 +344,13 @@ static void __ieee80211_stop_queue(struc |
84 | 84 | ||
85 | rcu_read_lock(); | 85 | rcu_read_lock(); |
86 | list_for_each_entry_rcu(sdata, &local->interfaces, list) | 86 | list_for_each_entry_rcu(sdata, &local->interfaces, list) |
@@ -107,7 +107,7 @@ queue by using skb_set_queue_mapping(skb, 0) through ieee80211_tx_skb() | |||
107 | ieee80211_set_qos_hdr(local, skb); | 107 | ieee80211_set_qos_hdr(local, skb); |
108 | ieee80211_tx(sdata, skb, false); | 108 | ieee80211_tx(sdata, skb, false); |
109 | rcu_read_unlock(); | 109 | rcu_read_unlock(); |
110 | @@ -2088,7 +2092,14 @@ void ieee80211_tx_pending(unsigned long | 110 | @@ -2108,7 +2112,14 @@ void ieee80211_tx_pending(unsigned long |
111 | 111 | ||
112 | if (skb_queue_empty(&local->pending[i])) | 112 | if (skb_queue_empty(&local->pending[i])) |
113 | list_for_each_entry_rcu(sdata, &local->interfaces, list) | 113 | list_for_each_entry_rcu(sdata, &local->interfaces, list) |
diff --git a/patches/26-sdio-quirks.patch b/patches/26-sdio-quirks.patch index a7fc6fe..5d0e643 100644 --- a/patches/26-sdio-quirks.patch +++ b/patches/26-sdio-quirks.patch | |||
@@ -2,7 +2,7 @@ The quirks attribute is not available on older kernels. | |||
2 | 2 | ||
3 | --- a/drivers/net/wireless/libertas/if_sdio.c | 3 | --- a/drivers/net/wireless/libertas/if_sdio.c |
4 | +++ b/drivers/net/wireless/libertas/if_sdio.c | 4 | +++ b/drivers/net/wireless/libertas/if_sdio.c |
5 | @@ -1039,6 +1039,7 @@ static int if_sdio_probe(struct sdio_fun | 5 | @@ -777,6 +777,7 @@ static int if_sdio_power_on(struct if_sd |
6 | if (ret) | 6 | if (ret) |
7 | goto release; | 7 | goto release; |
8 | 8 | ||
@@ -10,9 +10,9 @@ The quirks attribute is not available on older kernels. | |||
10 | /* For 1-bit transfers to the 8686 model, we need to enable the | 10 | /* For 1-bit transfers to the 8686 model, we need to enable the |
11 | * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0 | 11 | * interrupt flag in the CCCR register. Set the MMC_QUIRK_LENIENT_FN0 |
12 | * bit to allow access to non-vendor registers. */ | 12 | * bit to allow access to non-vendor registers. */ |
13 | @@ -1057,6 +1058,7 @@ static int if_sdio_probe(struct sdio_fun | 13 | @@ -795,6 +796,7 @@ static int if_sdio_power_on(struct if_sd |
14 | if (ret) | 14 | if (ret) |
15 | goto release_int; | 15 | goto disable; |
16 | } | 16 | } |
17 | +#endif | 17 | +#endif |
18 | 18 | ||
diff --git a/patches/29-sdio_no_suspend.patch b/patches/29-sdio_no_suspend.patch index 6cc2b8a..843e617 100644 --- a/patches/29-sdio_no_suspend.patch +++ b/patches/29-sdio_no_suspend.patch | |||
@@ -5,7 +5,7 @@ suspend and resume that are not backported. | |||
5 | 5 | ||
6 | --- a/drivers/net/wireless/libertas/if_sdio.c | 6 | --- a/drivers/net/wireless/libertas/if_sdio.c |
7 | +++ b/drivers/net/wireless/libertas/if_sdio.c | 7 | +++ b/drivers/net/wireless/libertas/if_sdio.c |
8 | @@ -1241,6 +1241,7 @@ static void if_sdio_remove(struct sdio_f | 8 | @@ -1306,6 +1306,7 @@ static void if_sdio_remove(struct sdio_f |
9 | lbs_deb_leave(LBS_DEB_SDIO); | 9 | lbs_deb_leave(LBS_DEB_SDIO); |
10 | } | 10 | } |
11 | 11 | ||
@@ -13,7 +13,7 @@ suspend and resume that are not backported. | |||
13 | static int if_sdio_suspend(struct device *dev) | 13 | static int if_sdio_suspend(struct device *dev) |
14 | { | 14 | { |
15 | struct sdio_func *func = dev_to_sdio_func(dev); | 15 | struct sdio_func *func = dev_to_sdio_func(dev); |
16 | @@ -1294,15 +1295,18 @@ static const struct dev_pm_ops if_sdio_p | 16 | @@ -1359,15 +1360,18 @@ static const struct dev_pm_ops if_sdio_p |
17 | .suspend = if_sdio_suspend, | 17 | .suspend = if_sdio_suspend, |
18 | .resume = if_sdio_resume, | 18 | .resume = if_sdio_resume, |
19 | }; | 19 | }; |
diff --git a/patches/30-bridge-port.patch b/patches/30-bridge-port.patch index 4b03abd..d557402 100644 --- a/patches/30-bridge-port.patch +++ b/patches/30-bridge-port.patch | |||
@@ -23,7 +23,7 @@ compat-wireless. | |||
23 | 23 | ||
24 | --- a/net/wireless/util.c | 24 | --- a/net/wireless/util.c |
25 | +++ b/net/wireless/util.c | 25 | +++ b/net/wireless/util.c |
26 | @@ -801,7 +801,7 @@ int cfg80211_change_iface(struct cfg8021 | 26 | @@ -802,7 +802,7 @@ int cfg80211_change_iface(struct cfg8021 |
27 | return -EOPNOTSUPP; | 27 | return -EOPNOTSUPP; |
28 | 28 | ||
29 | /* if it's part of a bridge, reject changing type to station/ibss */ | 29 | /* if it's part of a bridge, reject changing type to station/ibss */ |
@@ -34,7 +34,7 @@ compat-wireless. | |||
34 | ntype == NL80211_IFTYPE_P2P_CLIENT)) | 34 | ntype == NL80211_IFTYPE_P2P_CLIENT)) |
35 | --- a/net/wireless/nl80211.c | 35 | --- a/net/wireless/nl80211.c |
36 | +++ b/net/wireless/nl80211.c | 36 | +++ b/net/wireless/nl80211.c |
37 | @@ -1514,7 +1514,7 @@ static int nl80211_valid_4addr(struct cf | 37 | @@ -1524,7 +1524,7 @@ static int nl80211_valid_4addr(struct cf |
38 | enum nl80211_iftype iftype) | 38 | enum nl80211_iftype iftype) |
39 | { | 39 | { |
40 | if (!use_4addr) { | 40 | if (!use_4addr) { |
diff --git a/patches/40-netdev-hw-features.patch b/patches/40-netdev-hw-features.patch index 22a0e9d..ff78a4c 100644 --- a/patches/40-netdev-hw-features.patch +++ b/patches/40-netdev-hw-features.patch | |||
@@ -82,7 +82,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 | |||
82 | if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) { | 82 | if (adapter->hw.ctrl_flags & ATL1C_FPGA_VERSION) { |
83 | @@ -2606,8 +2619,10 @@ static const struct net_device_ops atl1c | 83 | @@ -2606,8 +2619,10 @@ static const struct net_device_ops atl1c |
84 | .ndo_set_mac_address = atl1c_set_mac_addr, | 84 | .ndo_set_mac_address = atl1c_set_mac_addr, |
85 | .ndo_set_multicast_list = atl1c_set_multi, | 85 | .ndo_set_rx_mode = atl1c_set_multi, |
86 | .ndo_change_mtu = atl1c_change_mtu, | 86 | .ndo_change_mtu = atl1c_change_mtu, |
87 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) | 87 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) |
88 | .ndo_fix_features = atl1c_fix_features, | 88 | .ndo_fix_features = atl1c_fix_features, |
@@ -159,7 +159,7 @@ Date: Thu Apr 7 07:32:18 2011 +0000 | |||
159 | /* reset MAC to disable all RX/TX */ | 159 | /* reset MAC to disable all RX/TX */ |
160 | atl1e_reset_hw(&adapter->hw); | 160 | atl1e_reset_hw(&adapter->hw); |
161 | @@ -2219,8 +2225,10 @@ static const struct net_device_ops atl1e | 161 | @@ -2219,8 +2225,10 @@ static const struct net_device_ops atl1e |
162 | .ndo_set_multicast_list = atl1e_set_multi, | 162 | .ndo_set_rx_mode = atl1e_set_multi, |
163 | .ndo_validate_addr = eth_validate_addr, | 163 | .ndo_validate_addr = eth_validate_addr, |
164 | .ndo_set_mac_address = atl1e_set_mac_addr, | 164 | .ndo_set_mac_address = atl1e_set_mac_addr, |
165 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) | 165 | +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) |
diff --git a/patches/42-netlink_seq.patch b/patches/42-netlink_seq.patch index 45e4217..a62043f 100644 --- a/patches/42-netlink_seq.patch +++ b/patches/42-netlink_seq.patch | |||
@@ -1,6 +1,6 @@ | |||
1 | --- a/net/wireless/nl80211.c | 1 | --- a/net/wireless/nl80211.c |
2 | +++ b/net/wireless/nl80211.c | 2 | +++ b/net/wireless/nl80211.c |
3 | @@ -3794,7 +3794,9 @@ static int nl80211_dump_scan(struct sk_b | 3 | @@ -3874,7 +3874,9 @@ static int nl80211_dump_scan(struct sk_b |
4 | spin_lock_bh(&rdev->bss_lock); | 4 | spin_lock_bh(&rdev->bss_lock); |
5 | cfg80211_bss_expire(rdev); | 5 | cfg80211_bss_expire(rdev); |
6 | 6 | ||