Skip to content

Commit

Permalink
net: wireless: bcmdhd: match wl_cfg80211_reg_notifier prototype/defin…
Browse files Browse the repository at this point in the history
…ition

Signed-off-by: Ilies CHERGUI <[email protected]>
  • Loading branch information
ichergui authored and madisongh committed Feb 18, 2022
1 parent 6258c84 commit 40e3027
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions nvidia/drivers/net/wireless/bcmdhd/wl_cfg80211.c
Original file line number Diff line number Diff line change
Expand Up @@ -573,7 +573,11 @@ wl_cfg80211_add_iw_ie(struct bcm_cfg80211 *cfg, struct net_device *ndev, s32 bss
static s32 wl_setup_wiphy(struct wireless_dev *wdev, struct device *dev, void *data);
static void wl_free_wdev(struct bcm_cfg80211 *cfg);
#ifdef CONFIG_CFG80211_INTERNAL_REGDB
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0))
static int
#else
static void
#endif /* kernel version < 3.10.0 */
wl_cfg80211_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request);
#endif /* CONFIG_CFG80211_INTERNAL_REGDB */

Expand Down Expand Up @@ -8619,7 +8623,11 @@ s32 wl_mode_to_nl80211_iftype(s32 mode)
}

#ifdef CONFIG_CFG80211_INTERNAL_REGDB
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0))
static int
#else
static void
#endif /* kernel version < 3.10.0 */
wl_cfg80211_reg_notifier(
struct wiphy *wiphy,
struct regulatory_request *request)
Expand All @@ -8629,7 +8637,11 @@ wl_cfg80211_reg_notifier(

if (!request || !cfg) {
WL_ERR(("Invalid arg\n"));
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0))
return -EINVAL;
#else
return;
#endif /* kernel version < 3.10.0 */
}

WL_DBG(("ccode: %c%c Initiator: %d\n",
Expand All @@ -8654,7 +8666,11 @@ wl_cfg80211_reg_notifier(
WL_ERR(("set country Failed :%d\n", ret));
}

#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0))
return ret;
#else
return;
#endif /* kernel version < 3.10.0 */
}
#endif /* CONFIG_CFG80211_INTERNAL_REGDB */

Expand Down

0 comments on commit 40e3027

Please sign in to comment.