qtnfmac: add support for 4addr mode
Advertise WIPHY_FLAG_4ADDR_STATION capability to wireless core. Send use4addr interface change flag to firmware in change_virtual_intf cfg80211 callback. In order to enable adding wireless station interface to bridge one should turn on 4addr mode using the following command: $ iw dev wlan0 set 4addr on $ brctl addif br0 wlan0 If this commands succeeds, then interface can be added to bridge. Note that when wireless interface is added to bridge, wpa_supplicant should be started with appropriate -b <brname> parameter, e.g: $ wpa_supplicant -Dnl80211 -iwlan0 -c/path/to/wpa.conf -b br0 Signed-off-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:

committed by
Kalle Valo

parent
d1365e794e
commit
de624a355d
@@ -122,7 +122,8 @@ qtnf_change_virtual_intf(struct wiphy *wiphy,
|
||||
struct vif_params *params)
|
||||
{
|
||||
struct qtnf_vif *vif = qtnf_netdev_get_priv(dev);
|
||||
u8 *mac_addr;
|
||||
u8 *mac_addr = NULL;
|
||||
int use4addr = 0;
|
||||
int ret;
|
||||
|
||||
ret = qtnf_validate_iface_combinations(wiphy, vif, type);
|
||||
@@ -132,14 +133,14 @@ qtnf_change_virtual_intf(struct wiphy *wiphy,
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (params)
|
||||
if (params) {
|
||||
mac_addr = params->macaddr;
|
||||
else
|
||||
mac_addr = NULL;
|
||||
use4addr = params->use_4addr;
|
||||
}
|
||||
|
||||
qtnf_scan_done(vif->mac, true);
|
||||
|
||||
ret = qtnf_cmd_send_change_intf_type(vif, type, mac_addr);
|
||||
ret = qtnf_cmd_send_change_intf_type(vif, type, use4addr, mac_addr);
|
||||
if (ret) {
|
||||
pr_err("VIF%u.%u: failed to change type to %d\n",
|
||||
vif->mac->macid, vif->vifid, type);
|
||||
@@ -190,6 +191,7 @@ static struct wireless_dev *qtnf_add_virtual_intf(struct wiphy *wiphy,
|
||||
struct qtnf_wmac *mac;
|
||||
struct qtnf_vif *vif;
|
||||
u8 *mac_addr = NULL;
|
||||
int use4addr = 0;
|
||||
int ret;
|
||||
|
||||
mac = wiphy_priv(wiphy);
|
||||
@@ -225,10 +227,12 @@ static struct wireless_dev *qtnf_add_virtual_intf(struct wiphy *wiphy,
|
||||
return ERR_PTR(-ENOTSUPP);
|
||||
}
|
||||
|
||||
if (params)
|
||||
if (params) {
|
||||
mac_addr = params->macaddr;
|
||||
use4addr = params->use_4addr;
|
||||
}
|
||||
|
||||
ret = qtnf_cmd_send_add_intf(vif, type, mac_addr);
|
||||
ret = qtnf_cmd_send_add_intf(vif, type, use4addr, mac_addr);
|
||||
if (ret) {
|
||||
pr_err("VIF%u.%u: failed to add VIF %pM\n",
|
||||
mac->macid, vif->vifid, mac_addr);
|
||||
@@ -1107,7 +1111,8 @@ int qtnf_wiphy_register(struct qtnf_hw_info *hw_info, struct qtnf_wmac *mac)
|
||||
wiphy->flags |= WIPHY_FLAG_HAVE_AP_SME |
|
||||
WIPHY_FLAG_AP_PROBE_RESP_OFFLOAD |
|
||||
WIPHY_FLAG_AP_UAPSD |
|
||||
WIPHY_FLAG_HAS_CHANNEL_SWITCH;
|
||||
WIPHY_FLAG_HAS_CHANNEL_SWITCH |
|
||||
WIPHY_FLAG_4ADDR_STATION;
|
||||
wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
|
||||
|
||||
if (hw_info->hw_capab & QLINK_HW_CAPAB_DFS_OFFLOAD)
|
||||
|
Reference in New Issue
Block a user