diff options
author | John W. Linville <linville@tuxdriver.com> | 2010-06-17 20:21:14 (GMT) |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-17 20:21:14 (GMT) |
commit | abf52f86aa0a49a7377350cafa8f218c4cd227e7 (patch) | |
tree | dd9549023a99d37fb1bbcbaad9c10ae102a1882e /net/mac80211/work.c | |
parent | 6a0076e02a884e86c762a7b63cb50c2e30067491 (diff) | |
parent | 021570e55b7152843376b9d9f60624e3e05ac054 (diff) | |
download | linux-fsl-qoriq-abf52f86aa0a49a7377350cafa8f218c4cd227e7.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
net/mac80211/mlme.c
Diffstat (limited to 'net/mac80211/work.c')
-rw-r--r-- | net/mac80211/work.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 4157717..c22a71c 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c @@ -715,7 +715,7 @@ static void ieee80211_work_rx_queued_mgmt(struct ieee80211_local *local, struct ieee80211_rx_status *rx_status; struct ieee80211_mgmt *mgmt; struct ieee80211_work *wk; - enum work_action rma; + enum work_action rma = WORK_ACT_NONE; u16 fc; rx_status = (struct ieee80211_rx_status *) skb->cb; |