aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/acx-mac80211/patches
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2016-05-14 17:38:56 +0200
committerFelix Fietkau <nbd@nbd.name>2016-05-15 20:55:39 +0200
commitdf93d53a4b7a5ce284dc0c6509057979f233cb92 (patch)
treed99034d6d05295b9e27648dcbcf743b51c8a0c5b /package/kernel/acx-mac80211/patches
parentace946152dd0806b25bcb3812b33ab5df95966b7 (diff)
downloadupstream-df93d53a4b7a5ce284dc0c6509057979f233cb92.tar.gz
upstream-df93d53a4b7a5ce284dc0c6509057979f233cb92.tar.bz2
upstream-df93d53a4b7a5ce284dc0c6509057979f233cb92.zip
mac80211: update to wireless-testing 2016-05-12
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/acx-mac80211/patches')
-rw-r--r--package/kernel/acx-mac80211/patches/300-api_sync.patch (renamed from package/kernel/acx-mac80211/patches/300-kernel_4_2.patch)36
1 files changed, 26 insertions, 10 deletions
diff --git a/package/kernel/acx-mac80211/patches/300-kernel_4_2.patch b/package/kernel/acx-mac80211/patches/300-api_sync.patch
index ee92b943e5..94d61351aa 100644
--- a/package/kernel/acx-mac80211/patches/300-kernel_4_2.patch
+++ b/package/kernel/acx-mac80211/patches/300-api_sync.patch
@@ -1,8 +1,6 @@
-diff --git a/main.c b/main.c
-index bfec856..3c482d9 100644
--- a/main.c
+++ b/main.c
-@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *adev)
+@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *ade
int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
{
@@ -11,7 +9,7 @@ index bfec856..3c482d9 100644
hw->queues = 1;
hw->wiphy->max_scan_ssids = 1;
-@@ -525,7 +525,7 @@ int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
+@@ -525,14 +525,14 @@ int acx_init_ieee80211(acx_device_t *ade
/* We base signal quality on winlevel approach of previous driver
* TODO OW 20100615 This should into a common init code
*/
@@ -20,7 +18,16 @@ index bfec856..3c482d9 100644
hw->max_signal = 100;
if (IS_ACX100(adev)) {
-@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee80211_hw *hw,
+- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
+ &acx100_band_2GHz;
+ } else if (IS_ACX111(adev))
+- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
+ &acx111_band_2GHz;
+ else {
+ log(L_ANY, "Error: Unknown device");
+@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee
changed_flags, *total_flags);
/* OWI TODO: Set also FIF_PROBE_REQ ? */
@@ -31,7 +38,7 @@ index bfec856..3c482d9 100644
logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
-@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
+@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw,
}
int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -43,7 +50,7 @@ index bfec856..3c482d9 100644
struct sk_buff *skb;
size_t ssid_len = 0;
u8 *ssid = NULL;
-@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *
goto out;
}
#else
@@ -52,11 +59,9 @@ index bfec856..3c482d9 100644
req->ie_len);
if (!skb) {
ret = -ENOMEM;
-diff --git a/main.h b/main.h
-index 293f5c8..84ecb9a 100644
--- a/main.h
+++ b/main.h
-@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
+@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw,
#endif
int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
@@ -65,3 +70,14 @@ index 293f5c8..84ecb9a 100644
int acx_recover_hw(acx_device_t *adev);
+--- a/cardsetting.c
++++ b/cardsetting.c
+@@ -159,7 +159,7 @@ int acx_set_channel(acx_device_t *adev,
+ int res = 0;
+
+ adev->rx_status.freq = freq;
+- adev->rx_status.band = IEEE80211_BAND_2GHZ;
++ adev->rx_status.band = NL80211_BAND_2GHZ;
+
+ adev->channel = channel;
+