Skip to content

Commit 878ac00

Browse files
committed
Merge branch 'at91-5.10-trunk/wilc_new' into linux-5.10-at91
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
2 parents 0c3a97a + 4d0af6a commit 878ac00

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/net/wireless/microchip/wilc1000/cfg80211.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -882,6 +882,12 @@ static int set_default_key(struct wiphy *wiphy, struct net_device *netdev,
882882
return 0;
883883
}
884884

885+
static int set_default_mgmt_key (struct wiphy *wiphy,struct net_device *netdev,
886+
u8 key_index)
887+
{
888+
return 0;
889+
}
890+
885891
#if KERNEL_VERSION(3, 16, 0) <= LINUX_VERSION_CODE
886892
static int get_station(struct wiphy *wiphy, struct net_device *dev,
887893
const u8 *mac, struct station_info *sinfo)
@@ -2252,6 +2258,7 @@ static const struct cfg80211_ops wilc_cfg80211_ops = {
22522258
.del_key = del_key,
22532259
.get_key = get_key,
22542260
.set_default_key = set_default_key,
2261+
.set_default_mgmt_key = set_default_mgmt_key,
22552262
.add_virtual_intf = add_virtual_intf,
22562263
.del_virtual_intf = del_virtual_intf,
22572264
.change_virtual_intf = change_virtual_intf,

0 commit comments

Comments
 (0)