diff --git a/[refs] b/[refs] index 1690332f70b6..1b890562f430 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 942623166df3256821e8451273bc07737745e3cb +refs/heads/master: a1e567c83f541432e687142570215b75bebb1338 diff --git a/trunk/net/wireless/nl80211.c b/trunk/net/wireless/nl80211.c index 85a23de7bff3..1d6ef24254fe 100644 --- a/trunk/net/wireless/nl80211.c +++ b/trunk/net/wireless/nl80211.c @@ -833,7 +833,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) struct cfg80211_registered_device *rdev; struct net_device *netdev = NULL; struct wireless_dev *wdev; - int result, rem_txq_params = 0; + int result = 0, rem_txq_params = 0; struct nlattr *nl_txq_params; u32 changed; u8 retry_short = 0, retry_long = 0;