Merge branch 'master'

3 files changed, 4 insertions, 4 deletions

diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
index f67711f2ee96..894a22558d9d 100644
--- a/net/ax25/sysctl_net_ax25.c
+++ b/net/ax25/sysctl_net_ax25.c
@@ -24,7 +24,7 @@ static int min_t3[1],   		max_t3[] = {3600 * HZ};
 static int min_idle[1],                 max_idle[] = {65535 * HZ};
 static int min_n2[] = {1},              max_n2[] = {31};
 static int min_paclen[] = {1},          max_paclen[] = {512};
-static int min_proto[1],                max_proto[] = {3};
+static int min_proto[1],                max_proto[] = { AX25_PROTO_MAX };
 static int min_ds_timeout[1],           max_ds_timeout[] = {65535 * HZ};
 
 static struct ctl_table_header *ax25_table_header;
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c
index 470221728503..3840d1911f2b 100644
--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@@ -131,7 +131,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
         a4_included = ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
                        (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS));
         qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&
-                       (WLAN_FC_GET_STYPE(fc) & 0x08));
+                       (WLAN_FC_GET_STYPE(fc) & IEEE80211_STYPE_QOS_DATA));
         aad_len = 22;
         if (a4_included)
                 aad_len += 6;
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c
index b410ab8bcf7a..7ac6a7165d9c 100644
--- a/net/ieee80211/ieee80211_rx.c
+++ b/net/ieee80211/ieee80211_rx.c
@@ -1417,10 +1417,10 @@ static void ieee80211_process_probe_response(struct ieee80211_device
 
         if (is_beacon(beacon->header.frame_ctl)) {
                 if (ieee->handle_beacon != NULL)
-                        ieee->handle_beacon(dev, beacon, &network);
+                        ieee->handle_beacon(dev, beacon, target);
         } else {
                 if (ieee->handle_probe_response != NULL)
-                        ieee->handle_probe_response(dev, beacon, &network);
+                        ieee->handle_probe_response(dev, beacon, target);
         }
 }