Skip to contentSkip to conversation

ieee80211: cleanup double word in comment

PATCH In review [email protected] 3 participants 4 messages Jan 25, 2022 802.11 (including cfg80211/NL80211)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ieee80211: cleanup double word in comment

From: Tom Rix <[email protected]>

Remove the second 'that'.

---
 include/linux/ieee80211.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ieee80211.h +1 -1
index 559b6c6449384..5475383936f8b 100644
@@ -467,7 +467,7 @@ static inline bool ieee80211_is_data_qos(__le16 fc)
 static inline bool ieee80211_is_data_present(__le16 fc)
 {
 	/*
-	 * mask with 0x40 and test that that bit is clear to only return true
+	 * mask with 0x40 and test that bit is clear to only return true
 	 * for the data-containing substypes.
 	 */
 	return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | 0x40)) ==
Signature · 1 line
2.26.3
maintainer
#1 lore raw
Quoted 14 lines · On Tue, 2022-01-25 at 10:07 -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

Remove the second 'that'.

---
 include/linux/ieee80211.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ieee80211.h +0 -0
index 559b6c6449384..5475383936f8b 100644

include/linux/ieee80211.h static inline bool ieee80211_is_data_qos(__le16 fc) · line 472

Quoted 7 lines
include/linux/ieee80211.h +1 -1
@@ -467,7 +467,7 @@ static inline bool ieee80211_is_data_qos(__le16 fc)
 static inline bool ieee80211_is_data_present(__le16 fc)
 {
 	/*
-	 * mask with 0x40 and test that that bit is clear to only return true
+	 * mask with 0x40 and test that bit is clear to only return true
 	 * for the data-containing substypes.
 

I don't think it's just a duplicate?

... and (test that) (that bit is clear to ...)

no?

johannes

#3 lore raw
In reply to [email protected]
Quoted 1 line · On Tue, 2022-01-25 at 10:07 -0800, [email protected] wrote:

Remove the second 'that'.

[]

include/linux/ieee80211.h

Quoted 1 line
include/linux/ieee80211.h +0 -0

[]

include/linux/ieee80211.h static inline bool ieee80211_is_data_qos(__le16 fc) · line 470

Quoted 6 lines
include/linux/ieee80211.h +1 -1
@@ -467,7 +467,7 @@ static inline bool ieee80211_is_data_qos(__le16 fc)
 static inline bool ieee80211_is_data_present(__le16 fc)
 {
 	/*
-	 * mask with 0x40 and test that that bit is clear to only return true
+	 * mask with 0x40 and test that bit is clear to only return true

This is likely a false positive...

"that that" is frequently correct usage.
"that the" might be acceptable here instead.

Not sure about the "only" use though.
Maybe fix the substypes typo too.

---
 include/linux/ieee80211.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/ieee80211.h +2 -2
index 559b6c6449384..0d9864adf9911 100644
@@ -467,8 +467,8 @@ static inline bool ieee80211_is_data_qos(__le16 fc)
 static inline bool ieee80211_is_data_present(__le16 fc)
 {
 	/*
-	 * mask with 0x40 and test that that bit is clear to only return true
-	 * for the data-containing substypes.
+	 * mask with 0x40 and test that the bit is clear to return true
+	 * only for the data-containing subtypes.
 	 */
 	return (fc & cpu_to_le16(IEEE80211_FCTL_FTYPE | 0x40)) ==
 	       cpu_to_le16(IEEE80211_FTYPE_DATA);
author
#2 lore raw
In reply to Johannes Berg
Quoted 24 lines · Johannes Berg
Quoted 14 lines · On Tue, 2022-01-25 at 10:07 -0800, [email protected] wrote:

From: Tom Rix <[email protected]>

Remove the second 'that'.

---
  include/linux/ieee80211.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/ieee80211.h +0 -0
index 559b6c6449384..5475383936f8b 100644

include/linux/ieee80211.h static inline bool ieee80211_is_data_qos(__le16 fc) · line 472

Quoted 7 lines
include/linux/ieee80211.h +1 -1
@@ -467,7 +467,7 @@ static inline bool ieee80211_is_data_qos(__le16 fc)
  static inline bool ieee80211_is_data_present(__le16 fc)
  {
  	/*
-	 * mask with 0x40 and test that that bit is clear to only return true
+	 * mask with 0x40 and test that bit is clear to only return true
  	 * for the data-containing substypes.
 

I don't think it's just a duplicate?

Quoted 3 lines

... and (test that) (that bit is clear to ...)

no?

ok, reads ok.

Sorry for the noise.

T

Quoted 3 lines

johannes