diff options
author | Zhu Yi <yi.zhu@intel.com> | 2006-02-14 17:18:19 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2006-03-17 15:08:02 -0500 |
commit | 9d0be03aeeadcd59bd8f57219817e876a5e88e88 (patch) | |
tree | 2b8f12a59c1e2d643c90ecd645ac508a43324eaa /drivers/net | |
parent | 85149bace30eae1dc1f86d2c327329673123dd22 (diff) |
[PATCH] ipw2200: use generic ieee80211_get_hdrlen() to get packet length
replace ipw2200 specific frame_hdr_len() with generic
ieee80211 routine ieee80211_get_hdrlen()
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/wireless/ipw2200.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/ipw2200.h | 23 |
2 files changed, 2 insertions, 24 deletions
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c index 129891feb43f..b2bbdf982b01 100644 --- a/drivers/net/wireless/ipw2200.c +++ b/drivers/net/wireless/ipw2200.c | |||
@@ -7895,7 +7895,8 @@ static void ipw_rx(struct ipw_priv *priv) | |||
7895 | le16_to_cpu(pkt->u.frame.length)); | 7895 | le16_to_cpu(pkt->u.frame.length)); |
7896 | 7896 | ||
7897 | if (le16_to_cpu(pkt->u.frame.length) < | 7897 | if (le16_to_cpu(pkt->u.frame.length) < |
7898 | frame_hdr_len(header)) { | 7898 | ieee80211_get_hdrlen(le16_to_cpu( |
7899 | header->frame_ctl))) { | ||
7899 | IPW_DEBUG_DROP | 7900 | IPW_DEBUG_DROP |
7900 | ("Received packet is too small. " | 7901 | ("Received packet is too small. " |
7901 | "Dropping.\n"); | 7902 | "Dropping.\n"); |
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index 5405ba105abf..c2a7aa32f724 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
@@ -1907,27 +1907,4 @@ struct ipw_cmd_log { | |||
1907 | 1907 | ||
1908 | #define IPW_MAX_CONFIG_RETRIES 10 | 1908 | #define IPW_MAX_CONFIG_RETRIES 10 |
1909 | 1909 | ||
1910 | static inline u32 frame_hdr_len(struct ieee80211_hdr_4addr *hdr) | ||
1911 | { | ||
1912 | u32 retval; | ||
1913 | u16 fc; | ||
1914 | |||
1915 | retval = sizeof(struct ieee80211_hdr_3addr); | ||
1916 | fc = le16_to_cpu(hdr->frame_ctl); | ||
1917 | |||
1918 | /* | ||
1919 | * Function ToDS FromDS | ||
1920 | * IBSS 0 0 | ||
1921 | * To AP 1 0 | ||
1922 | * From AP 0 1 | ||
1923 | * WDS (bridge) 1 1 | ||
1924 | * | ||
1925 | * Only WDS frames use Address4 among them. --YZ | ||
1926 | */ | ||
1927 | if (!(fc & IEEE80211_FCTL_TODS) || !(fc & IEEE80211_FCTL_FROMDS)) | ||
1928 | retval -= ETH_ALEN; | ||
1929 | |||
1930 | return retval; | ||
1931 | } | ||
1932 | |||
1933 | #endif /* __ipw2200_h__ */ | 1910 | #endif /* __ipw2200_h__ */ |