The following commit has been merged in the batman-adv/next branch: commit 2f9279b5568c4de8c37566f11e7c26292a3f4bf2 Author: Fengguang Wu fengguang.wu@intel.com Date: Tue Aug 7 10:26:53 2012 +0800

mwifiex: fix code mis-alignment after the if statement

Signed-off-by: Fengguang Wu fengguang.wu@intel.com Acked-by: Bing Zhao bzhao@marvell.com Signed-off-by: John W. Linville linville@tuxdriver.com

diff --git a/drivers/net/wireless/mwifiex/scan.c b/drivers/net/wireless/mwifiex/scan.c index 3035412..215d07e6 100644 --- a/drivers/net/wireless/mwifiex/scan.c +++ b/drivers/net/wireless/mwifiex/scan.c @@ -1435,9 +1435,9 @@ int mwifiex_check_network_compatibility(struct mwifiex_private *priv, if (ret) dev_err(priv->adapter->dev, "cannot find ssid " "%s\n", bss_desc->ssid.ssid); - break; + break; default: - ret = 0; + ret = 0; } }