diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-16 22:41:55 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-16 22:41:55 +0200 |
commit | d8d326dc7ae6bec2a999d674c5babb6bf490587a (patch) | |
tree | 0169a23e34712e4a34db9c3dd658c14a59ded5d9 /net | |
parent | bridge: Fix OOM crash in deliver_clone (diff) | |
parent | mac80211: fix warn, enum may be used uninitialized (diff) | |
download | linux-d8d326dc7ae6bec2a999d674c5babb6bf490587a.tar.xz linux-d8d326dc7ae6bec2a999d674c5babb6bf490587a.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-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 be3d4a698692..b025dc7bb0fd 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; |