diff options
| author | David S. Miller <davem@davemloft.net> | 2009-04-25 19:36:46 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-04-25 19:36:46 -0400 |
| commit | 495a1b4eff1a216a3ea171ac137f1807e6555f52 (patch) | |
| tree | 72d059d6d66fac6a74df33bac2eb40dcd0ea0732 /net/mac80211/rx.c | |
| parent | ad8affd972a705a38e769859c50ee8e749b631da (diff) | |
| parent | d3feaf5ad12259927039a675cfb25dc342b403ab (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
net/mac80211/pm.c
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 9776f73c51ad..a5afb79dab6e 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1932,7 +1932,7 @@ static void ieee80211_rx_michael_mic_report(struct net_device *dev, | |||
| 1932 | !ieee80211_is_auth(hdr->frame_control)) | 1932 | !ieee80211_is_auth(hdr->frame_control)) |
| 1933 | goto ignore; | 1933 | goto ignore; |
| 1934 | 1934 | ||
| 1935 | mac80211_ev_michael_mic_failure(rx->sdata, keyidx, hdr); | 1935 | mac80211_ev_michael_mic_failure(rx->sdata, keyidx, hdr, NULL); |
| 1936 | ignore: | 1936 | ignore: |
| 1937 | dev_kfree_skb(rx->skb); | 1937 | dev_kfree_skb(rx->skb); |
| 1938 | rx->skb = NULL; | 1938 | rx->skb = NULL; |