From: Jiri Benc <jbenc@suse.cz>
To: NetDev <netdev@oss.sgi.com>
Cc: Jeff Garzik <jgarzik@pobox.com>, Jirka Bohac <jbohac@suse.cz>
Subject: [7/9] ipw: fix after "ieee80211: ethernet independency"
Date: Fri, 3 Jun 2005 18:35:26 +0200 [thread overview]
Message-ID: <20050603183526.0effd2b0@griffin.suse.cz> (raw)
In-Reply-To: <20050603182625.64d33be3@griffin.suse.cz>
Fixes ipw2200 after making the ieee80211 layer independent of ethernet.
Signed-off-by: Jiri Benc <jbenc@suse.cz>
Signed-off-by: Jirka Bohac <jbohac@suse.cz>
Index: netdev/drivers/net/wireless/ipw2200.c
===================================================================
--- netdev.orig/drivers/net/wireless/ipw2200.c 2005-05-31 18:25:53.000000000 +0200
+++ netdev/drivers/net/wireless/ipw2200.c 2005-05-31 18:32:18.000000000 +0200
@@ -4920,8 +4920,8 @@
ETH_ALEN) ||
!memcmp(header->addr3,
priv->bssid, ETH_ALEN) ||
- is_broadcast_ether_addr(header->addr1) ||
- is_multicast_ether_addr(header->addr1);
+ is_broadcast_ieee80211_addr(header->addr1) ||
+ is_multicast_ieee80211_addr(header->addr1);
break;
case IW_MODE_INFRA:
@@ -4932,8 +4932,8 @@
!memcmp(header->addr1,
priv->net_dev->dev_addr,
ETH_ALEN) ||
- is_broadcast_ether_addr(header->addr1) ||
- is_multicast_ether_addr(header->addr1);
+ is_broadcast_ieee80211_addr(header->addr1) ||
+ is_multicast_ieee80211_addr(header->addr1);
break;
}
@@ -6285,8 +6285,8 @@
switch (priv->ieee->iw_mode) {
case IW_MODE_ADHOC:
hdr_len = IEEE80211_3ADDR_LEN;
- unicast = !is_broadcast_ether_addr(hdr->addr1) &&
- !is_multicast_ether_addr(hdr->addr1);
+ unicast = !is_broadcast_ieee80211_addr(hdr->addr1) &&
+ !is_multicast_ieee80211_addr(hdr->addr1);
id = ipw_find_station(priv, hdr->addr1);
if (id == IPW_INVALID_STATION) {
id = ipw_add_station(priv, hdr->addr1);
@@ -6301,8 +6301,8 @@
case IW_MODE_INFRA:
default:
- unicast = !is_broadcast_ether_addr(hdr->addr3) &&
- !is_multicast_ether_addr(hdr->addr3);
+ unicast = !is_broadcast_ieee80211_addr(hdr->addr3) &&
+ !is_multicast_ieee80211_addr(hdr->addr3);
hdr_len = IEEE80211_3ADDR_LEN;
id = 0;
break;
--
Jiri Benc
SUSE Labs
next prev parent reply other threads:[~2005-06-03 16:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-03 16:26 [0/9] ieee80211: Improvements to the layer Jiri Benc
2005-06-03 16:28 ` [1/9] ieee80211: remove pci.h #include's Jiri Benc
2005-06-03 16:29 ` [2/9] ieee80211: fix recursive ipw2200 dependencies Jiri Benc
2005-06-03 16:30 ` [3/9] ieee80211: fix ipw 64bit compilation warnings Jiri Benc
2005-06-06 6:29 ` Zhu Yi
2005-06-07 12:58 ` Jiri Benc
2005-06-03 16:31 ` [4/9] ieee80211: ieee80211_device alignment fix and cleanup Jiri Benc
2005-06-03 16:32 ` [5/9] ipw: fix after "ieee80211_device alignment fix" Jiri Benc
2005-06-03 16:34 ` [6/9] ieee80211: ethernet independency Jiri Benc
2005-06-04 5:45 ` Jouni Malinen
2005-06-03 16:35 ` Jiri Benc [this message]
2005-06-03 16:36 ` [8/9] ieee80211: add sequence numbers Jiri Benc
2005-06-03 16:37 ` [9/9] ieee80211: ETH_P_802_11 ethertype Jiri Benc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050603183526.0effd2b0@griffin.suse.cz \
--to=jbenc@suse.cz \
--cc=jbohac@suse.cz \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).