mac80211: correct fragmentation threshold check
Johannes Berg
maintainerPATCH 1/1 mac80211: correct fragmentation threshold check
The fragmentation threshold is defined to be including the FCS, and the code that sets the TX_FRAGMENTED flag correctly accounts for those four bytes. The code that verifies this doesn't though, which could lead to spurious warnings and frames being dropped although everything is ok. Correct the code by accounting for the FCS.
--- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/mac80211/tx.c +1 -1
@@ -788,7 +788,7 @@ ieee80211_tx_h_fragment(struct ieee80211 hdrlen =ieee80211_hdrlen (hdr->frame_control);/* internal error, why is TX_FRAGMENTED set? */ -if (WARN_ON (skb->len <= frag_threshold)) +if (WARN_ON (skb->len +FCS_LEN <= frag_threshold))return TX_DROP ;/*
Does there happen to be a bugzilla somewhere that corresponds to this?
Quoted 26 lines · Johannes Berg
The fragmentation threshold is defined to be including the FCS, and the code that sets the
TX_FRAGMENTEDflag correctly accounts for those four bytes. The code that verifies this doesn't though, which could lead to spurious warnings and frames being dropped although everything is ok. Correct the code by accounting for the FCS.Signed-off-by Johannes Berg <[email protected]>--- net/mac80211/tx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)net/mac80211/tx.c +1
-1@@ -788,7 +788,7 @@ ieee80211_tx_h_fragment(struct ieee80211 hdrlen =ieee80211_hdrlen (hdr->frame_control);/* internal error, why is TX_FRAGMENTED set? */ -if (WARN_ON (skb->len <= frag_threshold)) +if (WARN_ON (skb->len +FCS_LEN <= frag_threshold))return TX_DROP ;/*
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Johannes Berg
maintainerQuoted 1 line · John W. Linville
Does there happen to be a bugzilla somewhere that corresponds to this?
No, Michael said he was running into this warning and this was the only spot I could find... There's a mail somewhere:
http://article.gmane.org/gmane.linux.kernel.wireless.general/32205
johannes