From b8a3bf3ca7d325e3c4c29e144eec2d2b91bcc84b Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 4 Apr 2012 13:53:41 -0700 Subject: [PATCH] HACK: bcmdhd: fix compile for 3.4 Disable the removed set_beacon/add_beacon interface, and add the new dBm parameter to cfg80211_rx_mgmt. Change-Id: Id68530e978886ef482bce51cc8233ffa76a86c5a Signed-off-by: Colin Cross --- drivers/net/wireless/bcmdhd/wl_cfg80211.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/bcmdhd/wl_cfg80211.c index 20bbb208291..ed0533b4ecf 100644 --- a/drivers/net/wireless/bcmdhd/wl_cfg80211.c +++ b/drivers/net/wireless/bcmdhd/wl_cfg80211.c @@ -4185,6 +4185,7 @@ exit: return 0; } +#if 0 static s32 wl_cfg80211_add_set_beacon(struct wiphy *wiphy, struct net_device *dev, struct beacon_parameters *info) @@ -4528,6 +4529,7 @@ exit: wldev_iovar_setint(dev, "mpc", 1); return err; } +#endif static struct cfg80211_ops wl_cfg80211_ops = { .add_virtual_intf = wl_cfg80211_add_virtual_iface, @@ -4559,8 +4561,10 @@ static struct cfg80211_ops wl_cfg80211_ops = { .mgmt_frame_register = wl_cfg80211_mgmt_frame_register, .change_bss = wl_cfg80211_change_bss, .set_channel = wl_cfg80211_set_channel, +#if 0 .set_beacon = wl_cfg80211_add_set_beacon, .add_beacon = wl_cfg80211_add_set_beacon, +#endif }; s32 wl_mode_to_nl80211_iftype(s32 mode) @@ -4910,11 +4914,11 @@ wl_notify_connect_status(struct wl_priv *wl, struct net_device *ndev, isfree = true; if (event == WLC_E_ASSOC_IND && reason == DOT11_SC_SUCCESS) { - cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC); + cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC); } else if (event == WLC_E_DISASSOC_IND) { - cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC); + cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC); } else if ((event == WLC_E_DEAUTH_IND) || (event == WLC_E_DEAUTH)) { - cfg80211_rx_mgmt(ndev, freq, mgmt_frame, len, GFP_ATOMIC); + cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, len, GFP_ATOMIC); } } else { @@ -5470,7 +5474,7 @@ wl_notify_rx_mgmt_frame(struct wl_priv *wl, struct net_device *ndev, mgmt_frame = (u8 *)((wl_event_rx_frame_data_t *)rxframe + 1); } - cfg80211_rx_mgmt(ndev, freq, mgmt_frame, mgmt_frame_len, GFP_ATOMIC); + cfg80211_rx_mgmt(ndev, freq, 0, mgmt_frame, mgmt_frame_len, GFP_ATOMIC); WL_DBG(("%s: mgmt_frame_len (%d) , e->datalen (%d), channel (%d), freq (%d)\n", __func__, mgmt_frame_len, ntoh32(e->datalen), channel, freq));