diff options
| author | Juuso Oikarinen <juuso.oikarinen@nokia.com> | 2010-07-08 17:49:58 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-08 16:35:50 -0400 |
| commit | eb887dfd8837bf0a2538418c02b3992fb9ff1f28 (patch) | |
| tree | e683ec601f59e6c739c04fe447bd59e3c9444176 /drivers/net/wireless/wl12xx/wl1271_acx.c | |
| parent | bbbb538e337a3eb2166d5a20307b93822bdacc4f (diff) | |
| download | blackbird-obmc-linux-eb887dfd8837bf0a2538418c02b3992fb9ff1f28.tar.gz blackbird-obmc-linux-eb887dfd8837bf0a2538418c02b3992fb9ff1f28.zip | |
wl1271: Use the ARP configuration function from mac80211
This patch updates the driver to use the ARP configuration function from the
mac80211. Also, clean up IPv6 support from the ACX function as ARP is not
used with that protocol version.
Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_acx.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_acx.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c index 5cadb9d06c76..b45ebbcf6c4a 100644 --- a/drivers/net/wireless/wl12xx/wl1271_acx.c +++ b/drivers/net/wireless/wl12xx/wl1271_acx.c @@ -1075,13 +1075,12 @@ out: return ret; } -int wl1271_acx_arp_ip_filter(struct wl1271 *wl, bool enable, u8 *address, - u8 version) +int wl1271_acx_arp_ip_filter(struct wl1271 *wl, u8 mode, u8 *address) { struct wl1271_acx_arp_filter *acx; int ret; - wl1271_debug(DEBUG_ACX, "acx arp ip filter, enable: %d", enable); + wl1271_debug(DEBUG_ACX, "acx arp ip filter, mode: %d", mode); acx = kzalloc(sizeof(*acx), GFP_KERNEL); if (!acx) { @@ -1089,17 +1088,11 @@ int wl1271_acx_arp_ip_filter(struct wl1271 *wl, bool enable, u8 *address, goto out; } - acx->version = version; - acx->enable = enable; + acx->version = ACX_IPV4_VERSION; + acx->enable = mode; - if (enable == true) { - if (version == ACX_IPV4_VERSION) - memcpy(acx->address, address, ACX_IPV4_ADDR_SIZE); - else if (version == ACX_IPV6_VERSION) - memcpy(acx->address, address, sizeof(acx->address)); - else - wl1271_error("Invalid IP version"); - } + if (mode != ACX_ARP_DISABLE) + memcpy(acx->address, address, ACX_IPV4_ADDR_SIZE); ret = wl1271_cmd_configure(wl, ACX_ARP_IP_FILTER, acx, sizeof(*acx)); |
