From: Dan Williams <dcbw@redhat.com>
Date: Wed, 8 Apr 2009 14:15:17 +0000 (-0400)
Subject: airo: queue SIOCSIWAUTH-requested auth mode change for next commit
X-Git-Tag: v2.6.30-rc4~68^2~40^2~15
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=011f5c5bb20c08af93faa8bfd8d611c8cf85134f;p=karo-tx-linux.git

airo: queue SIOCSIWAUTH-requested auth mode change for next commit

Code was clearly wrong, plus callers expect the mode change to happen as
soon as possible, not dropped on the floor until the next time some
other config value changes and a commit happens.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index f21a6171c691..c36d3a3d655f 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -6713,11 +6713,11 @@ static int airo_set_auth(struct net_device *dev,
 				local->config.authType = AUTH_ENCRYPT;
 			} else
 				return -EINVAL;
-			break;
 
 			/* Commit the changes to flags if needed */
 			if (local->config.authType != currentAuthType)
 				set_bit (FLAG_COMMIT, &local->flags);
+			break;
 		}
 
 	case IW_AUTH_WPA_ENABLED: