aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2200.c
diff options
context:
space:
mode:
authorZhu Yi <yi.zhu@intel.com>2006-08-20 23:38:08 -0400
committerJohn W. Linville <linville@tuxdriver.com>2006-08-29 17:06:32 -0400
commit88a93df4cbc1342108356bda4f163d5cb78b6381 (patch)
treec3c46fb93fc55c9f83fcf1cc591f913630507274 /drivers/net/wireless/ipw2200.c
parent851ca2687e224b3ad82222d9788532a0eaa05a41 (diff)
[PATCH] 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 <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2200.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index 04efe6930679..0e5548a15f41 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -7640,7 +7640,6 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
7640 /* Big bitfield of all the fields we provide in radiotap */ 7640 /* Big bitfield of all the fields we provide in radiotap */
7641 ipw_rt->rt_hdr.it_present = 7641 ipw_rt->rt_hdr.it_present =
7642 ((1 << IEEE80211_RADIOTAP_FLAGS) | 7642 ((1 << IEEE80211_RADIOTAP_FLAGS) |
7643 (1 << IEEE80211_RADIOTAP_TSFT) |
7644 (1 << IEEE80211_RADIOTAP_RATE) | 7643 (1 << IEEE80211_RADIOTAP_RATE) |
7645 (1 << IEEE80211_RADIOTAP_CHANNEL) | 7644 (1 << IEEE80211_RADIOTAP_CHANNEL) |
7646 (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | 7645 (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
@@ -7649,6 +7648,7 @@ static void ipw_handle_data_packet_monitor(struct ipw_priv *priv,
7649 7648
7650 /* Zero the flags, we'll add to them as we go */ 7649 /* Zero the flags, we'll add to them as we go */
7651 ipw_rt->rt_flags = 0; 7650 ipw_rt->rt_flags = 0;
7651 ipw_rt->rt_tsf = 0ULL;
7652 7652
7653 /* Convert signal to DBM */ 7653 /* Convert signal to DBM */
7654 ipw_rt->rt_dbmsignal = antsignal; 7654 ipw_rt->rt_dbmsignal = antsignal;
@@ -7767,7 +7767,6 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
7767 s8 noise = frame->noise; 7767 s8 noise = frame->noise;
7768 u8 rate = frame->rate; 7768 u8 rate = frame->rate;
7769 short len = le16_to_cpu(pkt->u.frame.length); 7769 short len = le16_to_cpu(pkt->u.frame.length);
7770 u64 tsf = 0;
7771 struct sk_buff *skb; 7770 struct sk_buff *skb;
7772 int hdr_only = 0; 7771 int hdr_only = 0;
7773 u16 filter = priv->prom_priv->filter; 7772 u16 filter = priv->prom_priv->filter;
@@ -7853,7 +7852,6 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
7853 /* Big bitfield of all the fields we provide in radiotap */ 7852 /* Big bitfield of all the fields we provide in radiotap */
7854 ipw_rt->rt_hdr.it_present = 7853 ipw_rt->rt_hdr.it_present =
7855 ((1 << IEEE80211_RADIOTAP_FLAGS) | 7854 ((1 << IEEE80211_RADIOTAP_FLAGS) |
7856 (1 << IEEE80211_RADIOTAP_TSFT) |
7857 (1 << IEEE80211_RADIOTAP_RATE) | 7855 (1 << IEEE80211_RADIOTAP_RATE) |
7858 (1 << IEEE80211_RADIOTAP_CHANNEL) | 7856 (1 << IEEE80211_RADIOTAP_CHANNEL) |
7859 (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | 7857 (1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) |
@@ -7862,8 +7860,7 @@ static void ipw_handle_promiscuous_rx(struct ipw_priv *priv,
7862 7860
7863 /* Zero the flags, we'll add to them as we go */ 7861 /* Zero the flags, we'll add to them as we go */
7864 ipw_rt->rt_flags = 0; 7862 ipw_rt->rt_flags = 0;
7865 7863 ipw_rt->rt_tsf = 0ULL;
7866 ipw_rt->rt_tsf = tsf;
7867 7864
7868 /* Convert to DBM */ 7865 /* Convert to DBM */
7869 ipw_rt->rt_dbmsignal = signal; 7866 ipw_rt->rt_dbmsignal = signal;