diff --git a/[refs] b/[refs]
index dd9164f11a14..a0cc33d90344 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15617858b3cf249a3577df8da970f779bbc8a737
+refs/heads/master: 2ab1f519cbec0902cb86f1e29b10f2f00dd020c0
diff --git a/trunk/drivers/net/wireless/airo.c b/trunk/drivers/net/wireless/airo.c
index 68c5e54230c1..87b6adbc34da 100644
--- a/trunk/drivers/net/wireless/airo.c
+++ b/trunk/drivers/net/wireless/airo.c
@@ -7865,9 +7865,9 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
 		ConfigRid *cfg = (ConfigRid *)iobuf;
 
 		if (test_bit(FLAG_MIC_CAPABLE, &ai->flags))
-			cfg->opmode |= MODE_MIC;
+			cfg->opmode |= cpu_to_le16(MODE_MIC);
 
-		if ((cfg->opmode & 0xFF) == MODE_STA_IBSS)
+		if ((le16_to_cpu(cfg->opmode) & 0xFF) == MODE_STA_IBSS)
 			set_bit (FLAG_ADHOC, &ai->flags);
 		else
 			clear_bit (FLAG_ADHOC, &ai->flags);