/* * Atheros AP96 board support * * Copyright (C) 2009 Marco Porsch * Copyright (C) 2009-2012 Gabor Juhos * Copyright (C) 2010 Atheros Communications * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 as published * by the Free Software Foundation. */ #include #include #include #include "dev-ap9x-pci.h" #include "dev-eth.h" #include "dev-gpio-buttons.h" #include "dev-leds-gpio.h" #include "dev-m25p80.h" #include "dev-usb.h" #include "machtypes.h" #define AP96_GPIO_LED_12_GREEN 0 #define AP96_GPIO_LED_3_GREEN 1 #define AP96_GPIO_LED_2_GREEN 2 #define AP96_GPIO_LED_WPS_GREEN 4 #define AP96_GPIO_LED_5_GREEN 5 #define AP96_GPIO_LED_4_ORANGE 6 /* Reset button - next to the power connector */ #define AP96_GPIO_BTN_RESET 3 /* WPS button - next to a led on right */ #define AP96_GPIO_BTN_WPS 8 #define AP96_KEYS_POLL_INTERVAL 20 /* msecs */ #define AP96_KEYS_DEBOUNCE_INTERVAL (3 * AP96_KEYS_POLL_INTERVAL) #define AP96_WMAC0_MAC_OFFSET 0x120c #define AP96_WMAC1_MAC_OFFSET 0x520c #define AP96_CALDATA0_OFFSET 0x1000 #define AP96_CALDATA1_OFFSET 0x5000 /* * AP96 has 12 unlabeled leds in the front; these are numbered from 1 to 12 * below (from left to right on the board). Led 1 seems to be on whenever the * board is powered. Led 11 shows LAN link activity actity. Led 3 is orange; * others are green. * * In addition, there is one led next to a button on the right side for WPS. */ static struct gpio_led ap96_leds_gpio[] __initdata = { { .name = "ap96:green:led2", .gpio = AP96_GPIO_LED_2_GREEN, .active_low = 1, }, { .name = "ap96:green:led3", .gpio = AP96_GPIO_LED_3_GREEN, .active_low = 1, }, { .name = "ap96:orange:led4", .gpio = AP96_GPIO_LED_4_ORANGE, .active_low = 1, }, { .name = "ap96:green:led5", .gpio = AP96_GPIO_LED_5_GREEN, .active_low = 1, }, { .name = "ap96:green:led12", .gpio = AP96_GPIO_LED_12_GREEN, .active_low = 1, }, { /* next to a button on right */ .name = "ap96:green:wps", .gpio = AP96_GPIO_LED_WPS_GREEN, .active_low = 1, } }; static struct gpio_keys_button ap96_gpio_keys[] __initdata = { { .desc = "reset", .type = EV_KEY, .code = KEY_RESTART, .debounce_interval = AP96_KEYS_DEBOUNCE_INTERVAL, .gpio = AP96_GPIO_BTN_RESET, .active_low = 1, }, { .desc = "wps", .type = EV_KEY, .code = KEY_WPS_BUTTON, .debounce_interval = AP96_KEYS_DEBOUNCE_INTERVAL, .gpio = AP96_GPIO_BTN_WPS, .active_low = 1, } }; #define AP96_WAN_PHYMASK 0x10 #define AP96_LAN_PHYMASK 0x0f static void __init ap96_setup(void) { u8 *art = (u8 *) KSEG1ADDR(0x1fff0000); ath79_register_mdio(0, ~(AP96_WAN_PHYMASK | AP96_LAN_PHYMASK)); ath79_init_mac(ath79_eth0_data.mac_addr, art, 0); ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; ath79_eth0_data.phy_mask = AP96_LAN_PHYMASK; ath79_eth0_data.speed = SPEED_1000; ath79_eth0_data.duplex = DUPLEX_FULL; ath79_register_eth(0); ath79_init_mac(ath79_eth1_data.mac_addr, art, 1); ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII; ath79_eth1_data.phy_mask = AP96_WAN_PHYMASK; ath79_eth1_pll_data.pll_1000 = 0x1f000000; ath79_register_eth(1); ath79_register_usb(); ath79_register_m25p80(NULL); ath79_register_leds_gpio(-1, ARRAY_SIZE(ap96_leds_gpio), ap96_leds_gpio); ath79_register_gpio_keys_polled(-1, AP96_KEYS_POLL_INTERVAL, ARRAY_SIZE(ap96_gpio_keys), ap96_gpio_keys); ap94_pci_init(art + AP96_CALDATA0_OFFSET, art + AP96_WMAC0_MAC_OFFSET, art + AP96_CALDATA1_OFFSET, art + AP96_WMAC1_MAC_OFFSET); } MIPS_MACHINE(ATH79_MACH_AP96, "AP96", "Atheros AP96", ap96_setup); 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 
diff --git a/main.c b/main.c
index bfec856..3c482d9 100644
--- a/main.c
+++ b/main.c
@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *adev)
 
 int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
 {
-	hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
+	__clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
 	hw->queues = 1;
 	hw->wiphy->max_scan_ssids = 1;
 
@@ -525,7 +525,7 @@ int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
 	/* We base signal quality on winlevel approach of previous driver
 	 * TODO OW 20100615 This should into a common init code
 	 */
-	hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
+	__set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
 	hw->max_signal = 100;
 
 	if (IS_ACX100(adev)) {
@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee80211_hw *hw,
 		changed_flags, *total_flags);
 
 	/* OWI TODO: Set also FIF_PROBE_REQ ? */
-	*total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
-			| FIF_CONTROL | FIF_OTHER_BSS);
+	*total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
+			| FIF_OTHER_BSS);
 
 	logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
 
@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 }
 
 int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                   struct cfg80211_scan_request *req)
+                   struct ieee80211_scan_request *hw_req)
 {
 	acx_device_t *adev = hw2adev(hw);
+	struct cfg80211_scan_request *req = &hw_req->req;
 	struct sk_buff *skb;
 	size_t ssid_len = 0;
 	u8 *ssid = NULL;
@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 		goto out;
 	}
 #else
-	skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
+	skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
 		req->ie_len);
 	if (!skb) {
 		ret = -ENOMEM;
diff --git a/main.h b/main.h
index 293f5c8..84ecb9a 100644
--- a/main.h
+++ b/main.h
@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
 #endif
 
 int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
-                   struct cfg80211_scan_request *req);
+                   struct ieee80211_scan_request *req);
 
 int acx_recover_hw(acx_device_t *adev);
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-29 15:31:46 +0000