diff options
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/ieee80211_ioctl.c | 1 | ||||
-rw-r--r-- | net/mac80211/ieee80211_sta.c | 1 | ||||
-rw-r--r-- | net/mac80211/wme.c | 7 | ||||
-rw-r--r-- | net/mac80211/wpa.c | 1 |
4 files changed, 4 insertions, 6 deletions
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c index d48f3aa30e30..383ad5f64c1f 100644 --- a/net/mac80211/ieee80211_ioctl.c +++ b/net/mac80211/ieee80211_ioctl.c | |||
@@ -968,6 +968,7 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev, | |||
968 | *param = !!(sdata->u.sta.flags & | 968 | *param = !!(sdata->u.sta.flags & |
969 | IEEE80211_STA_MIXED_CELL); | 969 | IEEE80211_STA_MIXED_CELL); |
970 | break; | 970 | break; |
971 | |||
971 | case PRISM2_PARAM_WMM_ENABLED: | 972 | case PRISM2_PARAM_WMM_ENABLED: |
972 | if (sdata->type != IEEE80211_IF_TYPE_STA && | 973 | if (sdata->type != IEEE80211_IF_TYPE_STA && |
973 | sdata->type != IEEE80211_IF_TYPE_IBSS) | 974 | sdata->type != IEEE80211_IF_TYPE_IBSS) |
diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c index a2443271629a..f98b2e1cedf3 100644 --- a/net/mac80211/ieee80211_sta.c +++ b/net/mac80211/ieee80211_sta.c | |||
@@ -234,7 +234,6 @@ static int ecw2cw(int ecw) | |||
234 | return cw - 1; | 234 | return cw - 1; |
235 | } | 235 | } |
236 | 236 | ||
237 | |||
238 | static void ieee80211_sta_wmm_params(struct net_device *dev, | 237 | static void ieee80211_sta_wmm_params(struct net_device *dev, |
239 | struct ieee80211_if_sta *ifsta, | 238 | struct ieee80211_if_sta *ifsta, |
240 | u8 *wmm_param, size_t wmm_param_len) | 239 | u8 *wmm_param, size_t wmm_param_len) |
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index d303229249e7..fcc8921722f4 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c | |||
@@ -125,14 +125,13 @@ static inline int classify80211(struct sk_buff *skb, struct Qdisc *qd) | |||
125 | } | 125 | } |
126 | 126 | ||
127 | /* use the data classifier to determine what 802.1d tag the | 127 | /* use the data classifier to determine what 802.1d tag the |
128 | * data frame has */ | 128 | * data frame has */ |
129 | skb->priority = classify_1d(skb, qd); | 129 | skb->priority = classify_1d(skb, qd); |
130 | 130 | ||
131 | /* incase we are a client verify acm is not set for this ac */ | 131 | /* in case we are a client verify acm is not set for this ac */ |
132 | while (unlikely(local->wmm_acm & BIT(skb->priority))) { | 132 | while (unlikely(local->wmm_acm & BIT(skb->priority))) { |
133 | if (wme_downgrade_ac(skb)) { | 133 | if (wme_downgrade_ac(skb)) { |
134 | /* No AC with lower priority has acm=0, | 134 | /* No AC with lower priority has acm=0, drop packet. */ |
135 | * drop packet. */ | ||
136 | return -1; | 135 | return -1; |
137 | } | 136 | } |
138 | } | 137 | } |
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index b6cd66e0ee58..775f89e42a43 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c | |||
@@ -550,7 +550,6 @@ ieee80211_tx_h_ccmp_encrypt(struct ieee80211_txrx_data *tx) | |||
550 | 550 | ||
551 | if (tx->u.tx.extra_frag) { | 551 | if (tx->u.tx.extra_frag) { |
552 | int i; | 552 | int i; |
553 | |||
554 | for (i = 0; i < tx->u.tx.num_extra_frag; i++) { | 553 | for (i = 0; i < tx->u.tx.num_extra_frag; i++) { |
555 | if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test) | 554 | if (ccmp_encrypt_skb(tx, tx->u.tx.extra_frag[i], test) |
556 | < 0) | 555 | < 0) |