diff options
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2100.c')
-rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 534e6557e7e6..29b8fa1adefd 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c | |||
@@ -6962,13 +6962,6 @@ static int ipw2100_wx_set_wap(struct net_device *dev, | |||
6962 | struct ipw2100_priv *priv = libipw_priv(dev); | 6962 | struct ipw2100_priv *priv = libipw_priv(dev); |
6963 | int err = 0; | 6963 | int err = 0; |
6964 | 6964 | ||
6965 | static const unsigned char any[] = { | ||
6966 | 0xff, 0xff, 0xff, 0xff, 0xff, 0xff | ||
6967 | }; | ||
6968 | static const unsigned char off[] = { | ||
6969 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 | ||
6970 | }; | ||
6971 | |||
6972 | // sanity checks | 6965 | // sanity checks |
6973 | if (wrqu->ap_addr.sa_family != ARPHRD_ETHER) | 6966 | if (wrqu->ap_addr.sa_family != ARPHRD_ETHER) |
6974 | return -EINVAL; | 6967 | return -EINVAL; |
@@ -6979,8 +6972,8 @@ static int ipw2100_wx_set_wap(struct net_device *dev, | |||
6979 | goto done; | 6972 | goto done; |
6980 | } | 6973 | } |
6981 | 6974 | ||
6982 | if (!memcmp(any, wrqu->ap_addr.sa_data, ETH_ALEN) || | 6975 | if (is_broadcast_ether_addr(wrqu->ap_addr.sa_data) || |
6983 | !memcmp(off, wrqu->ap_addr.sa_data, ETH_ALEN)) { | 6976 | is_zero_ether_addr(wrqu->ap_addr.sa_data)) { |
6984 | /* we disable mandatory BSSID association */ | 6977 | /* we disable mandatory BSSID association */ |
6985 | IPW_DEBUG_WX("exit - disable mandatory BSSID\n"); | 6978 | IPW_DEBUG_WX("exit - disable mandatory BSSID\n"); |
6986 | priv->config &= ~CFG_STATIC_BSSID; | 6979 | priv->config &= ~CFG_STATIC_BSSID; |