diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-17 12:11:52 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-17 12:11:52 -0500 |
| commit | 4144cb2ade46d97b9c41682fd2e9064a59f23a98 (patch) | |
| tree | 4b5ef937b4d0dcede6b1669f03c3b6dccf57d5bc /net/mac80211/rx.c | |
| parent | 59f608d84f937cb5e2fd3a0b9f848f200d47ba85 (diff) | |
| parent | 604c4ef1c453a1b2ea2cdf04d2b49afec421ebfa (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index f407427c642f..751409120769 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
| @@ -1979,6 +1979,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) | |||
| 1979 | mesh_path_error_tx(ifmsh->mshcfg.element_ttl, fwd_hdr->addr3, | 1979 | mesh_path_error_tx(ifmsh->mshcfg.element_ttl, fwd_hdr->addr3, |
| 1980 | 0, reason, fwd_hdr->addr2, sdata); | 1980 | 0, reason, fwd_hdr->addr2, sdata); |
| 1981 | IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_no_route); | 1981 | IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_no_route); |
| 1982 | kfree_skb(fwd_skb); | ||
| 1982 | return RX_DROP_MONITOR; | 1983 | return RX_DROP_MONITOR; |
| 1983 | } | 1984 | } |
| 1984 | 1985 | ||