From 034558ca56cdbec752b8839fb632ab0d09e2d656 Mon Sep 17 00:00:00 2001
From: Zhu Yi <yi.zhu@intel.com>
Date: Wed, 15 Feb 2006 06:18:19 +0800
Subject: [PATCH] --- yaml --- r: 21299 b: refs/heads/master c:
 9d0be03aeeadcd59bd8f57219817e876a5e88e88 h: refs/heads/master i:   21297:
 ba6f27630c084a0438250a7004dfb238bbd22035   21295:
 07510c7197e9b0e0cd529e57f8567dbc35808bbb v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/wireless/ipw2200.c |  3 ++-
 trunk/drivers/net/wireless/ipw2200.h | 23 -----------------------
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 26ca5e8cf40f..b971f435c4e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85149bace30eae1dc1f86d2c327329673123dd22
+refs/heads/master: 9d0be03aeeadcd59bd8f57219817e876a5e88e88
diff --git a/trunk/drivers/net/wireless/ipw2200.c b/trunk/drivers/net/wireless/ipw2200.c
index 129891feb43f..b2bbdf982b01 100644
--- a/trunk/drivers/net/wireless/ipw2200.c
+++ b/trunk/drivers/net/wireless/ipw2200.c
@@ -7895,7 +7895,8 @@ static void ipw_rx(struct ipw_priv *priv)
 					     le16_to_cpu(pkt->u.frame.length));
 
 				if (le16_to_cpu(pkt->u.frame.length) <
-				    frame_hdr_len(header)) {
+				    ieee80211_get_hdrlen(le16_to_cpu(
+						    header->frame_ctl))) {
 					IPW_DEBUG_DROP
 					    ("Received packet is too small. "
 					     "Dropping.\n");
diff --git a/trunk/drivers/net/wireless/ipw2200.h b/trunk/drivers/net/wireless/ipw2200.h
index 5405ba105abf..c2a7aa32f724 100644
--- a/trunk/drivers/net/wireless/ipw2200.h
+++ b/trunk/drivers/net/wireless/ipw2200.h
@@ -1907,27 +1907,4 @@ struct ipw_cmd_log {
 
 #define IPW_MAX_CONFIG_RETRIES 10
 
-static inline u32 frame_hdr_len(struct ieee80211_hdr_4addr *hdr)
-{
-	u32 retval;
-	u16 fc;
-
-	retval = sizeof(struct ieee80211_hdr_3addr);
-	fc = le16_to_cpu(hdr->frame_ctl);
-
-	/*
-	 * Function     ToDS    FromDS
-	 * IBSS         0       0
-	 * To AP        1       0
-	 * From AP      0       1
-	 * WDS (bridge) 1       1
-	 *
-	 * Only WDS frames use Address4 among them. --YZ
-	 */
-	if (!(fc & IEEE80211_FCTL_TODS) || !(fc & IEEE80211_FCTL_FROMDS))
-		retval -= ETH_ALEN;
-
-	return retval;
-}
-
 #endif				/* __ipw2200_h__ */