[package] refresh acx-mac80211 patches
[openwrt/svn-archive/archive.git] / package / acx-mac80211 / patches / 003-if_types.patch
1 --- a/acx_mac80211.h
2 +++ b/acx_mac80211.h
3 @@ -36,7 +36,7 @@ struct acx_interface {
4 /* Current BSSID (if any). */
5 u8 *bssid;
6
7 - /* Interface type. (IEEE80211_IF_TYPE_XXX) */
8 + /* Interface type. (NL80211_IFTYPE_XXX) */
9 int type;
10 /* Counter of active monitor interfaces. */
11 int monitor;
12 --- a/common.c
13 +++ b/common.c
14 @@ -4111,28 +4111,28 @@ static void acx_s_select_opmode(acx_devi
15
16 if (adev->interface.operating) {
17 switch (adev->interface.type) {
18 - case IEEE80211_IF_TYPE_AP:
19 + case NL80211_IFTYPE_AP:
20 if (adev->mode != ACX_MODE_3_AP)
21 {
22 adev->mode = ACX_MODE_3_AP;
23 changed = 1;
24 }
25 break;
26 - case IEEE80211_IF_TYPE_IBSS:
27 + case NL80211_IFTYPE_ADHOC:
28 if (adev->mode != ACX_MODE_0_ADHOC)
29 {
30 adev->mode = ACX_MODE_0_ADHOC;
31 changed = 1;
32 }
33 break;
34 - case IEEE80211_IF_TYPE_STA:
35 + case NL80211_IFTYPE_STATION:
36 if (adev->mode != ACX_MODE_2_STA)
37 {
38 adev->mode = ACX_MODE_2_STA;
39 changed = 1;
40 }
41 break;
42 - case IEEE80211_IF_TYPE_WDS:
43 + case NL80211_IFTYPE_WDS:
44 default:
45 if (adev->mode != ACX_MODE_OFF)
46 {
47 @@ -4142,7 +4142,7 @@ static void acx_s_select_opmode(acx_devi
48 break;
49 }
50 } else {
51 - if (adev->interface.type == IEEE80211_IF_TYPE_MNTR)
52 + if (adev->interface.type == NL80211_IFTYPE_MONITOR)
53 {
54 if (adev->mode != ACX_MODE_MONITOR)
55 {
56 @@ -4186,7 +4186,7 @@ int acx_add_interface(struct ieee80211_h
57 FN_ENTER;
58 acx_lock(adev, flags);
59
60 - if (conf->type == IEEE80211_IF_TYPE_MNTR) {
61 + if (conf->type == NL80211_IFTYPE_MONITOR) {
62 adev->interface.monitor++;
63 } else {
64 if (adev->interface.operating)
65 @@ -4232,7 +4232,7 @@ void acx_remove_interface(struct ieee802
66 FN_ENTER;
67
68 acx_sem_lock(adev);
69 - if (conf->type == IEEE80211_IF_TYPE_MNTR) {
70 + if (conf->type == NL80211_IFTYPE_MONITOR) {
71 adev->interface.monitor--;
72 // assert(bcm->interface.monitor >= 0);
73 } else {
74 @@ -4386,7 +4386,7 @@ extern int acx_config_interface(struct i
75
76 acx_lock(adev, flags);
77
78 - if ((vif->type != IEEE80211_IF_TYPE_MNTR)
79 + if ((vif->type != NL80211_IFTYPE_MONITOR)
80 && (adev->vif == vif)) {
81 if (conf->bssid)
82 {
83 @@ -4394,7 +4394,7 @@ extern int acx_config_interface(struct i
84 MAC_COPY(adev->bssid,conf->bssid);
85 }
86 }
87 - if ((vif->type == IEEE80211_IF_TYPE_AP)
88 + if ((vif->type == NL80211_IFTYPE_AP)
89 && (adev->vif == vif)) {
90 if ((conf->ssid_len > 0) && conf->ssid)
91 {