diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2007-12-19 01:31:23 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2008-01-28 14:59:46 -0800 |
| commit | 678f5f7117d5780d3a51b201c9f44b7bf90f6a76 (patch) | |
| tree | ddf555061ec729e3e14eabc506d0c3b8f32f25b8 /net/mac80211/util.c | |
| parent | mac80211: clean up eapol frame handling/port control (diff) | |
| download | linux-dev-678f5f7117d5780d3a51b201c9f44b7bf90f6a76.tar.xz linux-dev-678f5f7117d5780d3a51b201c9f44b7bf90f6a76.zip | |
mac80211: clean up eapol handling in TX path
The previous patch left only one user of the ieee80211_is_eapol()
function and that user can be eliminated easily by introducing
a new "frame is EAPOL" flag to handle the frame specially (we
already have this information) instead of doing the (expensive)
ieee80211_is_eapol() all the time.
Also, allow unencrypted frames to be sent when they are injected.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/util.c')
| -rw-r--r-- | net/mac80211/util.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index fb7fd896cd0d..2b02b2b9d645 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -40,10 +40,6 @@ const unsigned char rfc1042_header[] = const unsigned char bridge_tunnel_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 }; -/* No encapsulation header if EtherType < 0x600 (=length) */ -static const unsigned char eapol_header[] = - { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 0x88, 0x8e }; - static int rate_list_match(const int *rate_list, int rate) { @@ -223,19 +219,6 @@ int ieee80211_get_hdrlen_from_skb(const struct sk_buff *skb) } EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb); -int ieee80211_is_eapol(const struct sk_buff *skb, int hdrlen) -{ - if (unlikely(skb->len < 10)) - return 0; - - if (unlikely(skb->len >= hdrlen + sizeof(eapol_header) && - memcmp(skb->data + hdrlen, eapol_header, - sizeof(eapol_header)) == 0)) - return 1; - - return 0; -} - void ieee80211_tx_set_iswep(struct ieee80211_txrx_data *tx) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) tx->skb->data; |