diff options
| author |   Bob Copeland <me@bobcopeland.com> | 2019-01-17 16:32:42 -0500 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2019-01-19 09:11:44 +0100 |
| commit | a0dc02039a2ee54fb4ae400e0b755ed30e73e58c (patch) | |
| tree | 12bcd45b0320ced690b34d47a591e33da05ba076 /net | |
| parent | mac80211_hwsim: check that n_limits makes sense (diff) | |
| download | linux-dev-a0dc02039a2ee54fb4ae400e0b755ed30e73e58c.tar.xz linux-dev-a0dc02039a2ee54fb4ae400e0b755ed30e73e58c.zip | |
mac80211: fix miscounting of ttl-dropped frames
In ieee80211_rx_h_mesh_fwding, we increment the 'dropped_frames_ttl'
counter when we decrement the ttl to zero. For unicast frames
destined for other hosts, we stop processing the frame at that point.
For multicast frames, we do not rebroadcast it in this case, but we
do pass the frame up the stack to process it on this STA. That
doesn't match the usual definition of "dropped," so don't count
those as such.
With this change, something like `ping6 -i0.2 ff02::1%mesh0` from a
peer in a ttl=1 network no longer increments the counter rapidly.
Signed-off-by: Bob Copeland <bobcopeland@fb.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 45aad3d3108c..27a337bc8acf 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2723,7 +2723,9 @@ ieee80211_rx_h_mesh_fwding(struct ieee80211_rx_data *rx) skb_set_queue_mapping(skb, q); if (!--mesh_hdr->ttl) { - IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_ttl); + if (!is_multicast_ether_addr(hdr->addr1)) + IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, + dropped_frames_ttl); goto out; } |