diff --git a/[refs] b/[refs]
index 636355791dfb..36c405f71511 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d3e451ff71b4e951d4b522b460a94f36fb5b276
+refs/heads/master: 672cf3cefe5f686637dec72b9f3d21fe1cdc8c94
diff --git a/trunk/drivers/net/wireless/ath5k/pcu.c b/trunk/drivers/net/wireless/ath5k/pcu.c
index e758b70ab7eb..86f53a55b0f7 100644
--- a/trunk/drivers/net/wireless/ath5k/pcu.c
+++ b/trunk/drivers/net/wireless/ath5k/pcu.c
@@ -1044,7 +1044,7 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
 	__le32 key_v[5] = {};
 	__le32 key0 = 0, key1 = 0;
 	__le32 *rxmic, *txmic;
-	u32 keytype;
+	int keytype;
 	u16 micentry = entry + AR5K_KEYTABLE_MIC_OFFSET;
 	bool is_tkip;
 	const u8 *key_ptr;