Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 340114 Details for
Bug 459208
net-wireless/broadcom-sta-5.100.82.112-r2 fails to compile against sys-kernel/gentoo-sources-3.8.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
possible patch
broadcom-sta-5.100.82.112-linux-3.8.patch (text/plain), 4.06 KB, created by
Maxim Polunin
on 2013-02-25 20:45:28 UTC
(
hide
)
Description:
possible patch
Filename:
MIME Type:
Creator:
Maxim Polunin
Created:
2013-02-25 20:45:28 UTC
Size:
4.06 KB
patch
obsolete
>diff -ur broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_cfg80211.c broadcom-sta-5.100.82.112/src/wl/sys/wl_cfg80211.c >--- broadcom-sta-5.100.82.112.orig/src/wl/sys/wl_cfg80211.c 2013-02-25 23:56:44.171538633 +0400 >+++ broadcom-sta-5.100.82.112/src/wl/sys/wl_cfg80211.c 2013-02-26 00:16:18.437263566 +0400 >@@ -42,8 +42,13 @@ > enum nl80211_iftype type, u32 *flags, struct vif_params *params); > static s32 __wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, > struct cfg80211_scan_request *request, struct cfg80211_ssid *this_ssid); >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) >+static s32 wl_cfg80211_scan(struct wiphy *wiphy, >+ struct cfg80211_scan_request *request); >+#else > static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, > struct cfg80211_scan_request *request); >+#endif > static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed); > static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, > struct cfg80211_ibss_params *params); >@@ -56,7 +61,10 @@ > struct cfg80211_connect_params *sme); > static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code); > >-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) >+static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, >+ enum nl80211_tx_power_setting type, s32 dbm); >+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) > static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, > enum nl80211_tx_power_setting type, s32 dbm); > #else >@@ -64,7 +72,11 @@ > enum tx_power_setting type, s32 dbm); > #endif > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) >+static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm); >+#else > static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm); >+#endif > > #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) > static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, >@@ -570,10 +582,19 @@ > } > > static s32 >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) >+wl_cfg80211_scan(struct wiphy *wiphy, >+ struct cfg80211_scan_request *request) >+#else > wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev, >- struct cfg80211_scan_request *request) >+ struct cfg80211_scan_request *request) >+#endif > { > s32 err = 0; >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) >+ struct wl_priv *wl = wiphy_to_wl(wiphy); >+ struct net_device *ndev = wl_to_ndev(wl); >+#endif > > CHECK_SYS_UP(); > err = __wl_cfg80211_scan(wiphy, ndev, request, NULL); >@@ -742,7 +763,7 @@ > else > memset(&join_params.params.bssid, 0, ETHER_ADDR_LEN); > >- wl_ch_to_chanspec(params->channel, &join_params, &join_params_size); >+ wl_ch_to_chanspec(params->chandef.chan, &join_params, &join_params_size); > > err = wl_dev_ioctl(dev, WLC_SET_SSID, &join_params, join_params_size); > if (err) { >@@ -1099,7 +1120,10 @@ > return err; > } > >-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) >+static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, >+ enum nl80211_tx_power_setting type, s32 dbm) >+#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36) > static s32 > wl_cfg80211_set_tx_power(struct wiphy *wiphy, enum nl80211_tx_power_setting type, s32 dbm) > #else >@@ -1158,7 +1182,11 @@ > return err; > } > >+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) >+static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, s32 *dbm) >+#else > static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm) >+#endif > { > struct wl_priv *wl = wiphy_to_wl(wiphy); > struct net_device *ndev = wl_to_ndev(wl); >@@ -2074,8 +2102,8 @@ > beacon_interval = cpu_to_le16(bi->beacon_period); > } else { > WL_DBG(("Found the AP in the list - BSSID %pM\n", bss->bssid)); >- ie = bss->information_elements; >- ie_len = bss->len_information_elements; >+ ie = bss->ies->data; >+ ie_len = bss->ies->len; > beacon_interval = bss->beacon_interval; > cfg80211_put_bss(bss); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 459208
:
340112
|
340114
|
340682