Skip to contentSkip to conversation

ipw2200: remove the MAC timestamp present field from radiotap head

PATCH In review Zhu Yi 1 participant 1 message Aug 21, 2006

Subsystems (3)
Networking Network drivers Networking drivers (wireless)
lore
Share & tools
lore

Zhu Yi

author
#0 lore raw

PATCH 8/14 ipw2200: remove the MAC timestamp present field from radiotap head

IEEE80211_RADIOTAP_TSFT is defined as the Value in microseconds of the MAC's 64-bit 802.11 Time Synchronization Function timer when the first bit of the MPDU arrived at the MAC. Since ipw2200 hardware doesn't provide this value, we disable this feature from the radiotap header present flag.

Signed-off-by Zhu Yi <[email protected]>

---

 drivers/net/wireless/ipw2200.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

715b4e6d66a77e89d3dfd51c167bf4cbef4c7bce

drivers/net/wireless/ipw2200.c +2 -5
index 04efe69..0e5548a 100644
@@ -7640,7 +7640,6 @@ static void ipw_handle_data_packet_monit
 	/* Big bitfield of all the fields we provide in radiotap */
 	ipw_rt->rt_hdr.it_present =
 	    ((1 << IEEE80211_RADIOTAP_FLAGS) |
-	     (1 << IEEE80211_RADIOTAP_TSFT) |
 	     (1 << IEEE80211_RADIOTAP_RATE) |
 	     (1 << IEEE80211_RADIOTAP_CHANNEL) |
 	     (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |

@@ -7649,6 +7648,7 @@ static void ipw_handle_data_packet_monit
 
 	/* Zero the flags, we'll add to them as we go */
 	ipw_rt->rt_flags = 0;
+	ipw_rt->rt_tsf = 0ULL;
 
 	/* Convert signal to DBM */
 	ipw_rt->rt_dbmsignal = antsignal;

@@ -7767,7 +7767,6 @@ static void ipw_handle_promiscuous_rx(st
 	s8 noise = frame->noise;
 	u8 rate = frame->rate;
 	short len = le16_to_cpu(pkt->u.frame.length);
-	u64 tsf = 0;
 	struct sk_buff *skb;
 	int hdr_only = 0;
 	u16 filter = priv->prom_priv->filter;

@@ -7853,7 +7852,6 @@ static void ipw_handle_promiscuous_rx(st
 	/* Big bitfield of all the fields we provide in radiotap */
 	ipw_rt->rt_hdr.it_present =
 	    ((1 << IEEE80211_RADIOTAP_FLAGS) |
-	     (1 << IEEE80211_RADIOTAP_TSFT) |
 	     (1 << IEEE80211_RADIOTAP_RATE) |
 	     (1 << IEEE80211_RADIOTAP_CHANNEL) |
 	     (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |

@@ -7862,8 +7860,7 @@ static void ipw_handle_promiscuous_rx(st
 
 	/* Zero the flags, we'll add to them as we go */
 	ipw_rt->rt_flags = 0;
-
-	ipw_rt->rt_tsf = tsf;
+	ipw_rt->rt_tsf = 0ULL;
 
 	/* Convert to DBM */
 	ipw_rt->rt_dbmsignal = signal;
Signature · 1 line
1.2.6