diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 58 | ||||
| -rw-r--r-- | gcc.patch | 11 | ||||
| -rw-r--r-- | install | 13 | ||||
| -rw-r--r-- | license.patch | 10 | ||||
| -rw-r--r-- | linux-recent.patch | 340 | ||||
| -rw-r--r-- | modprobe.d | 5 |
7 files changed, 463 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 000000000000..554fc8b07859 --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,26 @@ +# Generated by makepkg 4.2.0 +# Tue Dec 30 17:03:18 UTC 2014 +pkgbase = broadcom-wl + pkgdesc = Broadcom 802.11abgn hybrid Linux networking device driver + pkgver = 6.30.223.248 + pkgrel = 4 + url = http://www.broadcom.com/support/802.11/linux_sta.php + install = install + arch = i686 + arch = x86_64 + license = custom + makedepends = linux-headers + depends = linux + source = http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz + source = modprobe.d + source = license.patch + source = linux-recent.patch + source = gcc.patch + sha256sums = 3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022 + sha256sums = b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32 + sha256sums = 2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac + sha256sums = ebbcac3a37787c86fa8515046d81d1d0bb2669215703d6fa2800233029bf3d63 + sha256sums = b07ce80f2e079cce08c8ec006dda091f6f73f158c8a62df5bac2fbabb6989849 + +pkgname = broadcom-wl + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 000000000000..d1fa6deda9f8 --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Armin K. <krejzi at email dot com> +# Contributor: Austin ( doorknob60 [at] gmail [dot] com ) +# Contributor: Gaetan Bisson <bisson@archlinux.org> + +pkgname=broadcom-wl +pkgver=6.30.223.248 +pkgrel=4 +pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' +url='http://www.broadcom.com/support/802.11/linux_sta.php' +arch=('i686' 'x86_64') +license=('custom') +depends=('linux') +makedepends=('linux-headers') +[[ $CARCH = x86_64 ]] && _arch=_64 || _arch= +source=("http://www.broadcom.com/docs/linux_sta/hybrid-v35${_arch}-nodebug-pcoem-${pkgver//./_}.tar.gz" + 'modprobe.d' + 'license.patch' + 'linux-recent.patch' + 'gcc.patch') +sha256sums=('b196543a429c22b2b8d75d0c1d9e6e7ff212c3d3e1f42cc6fd9e4858f01da1ad' + 'b4aca51ac5ed20cb79057437be7baf3650563b7a9d5efc515f0b9b34fbb9dc32' + '2f70be509aac743bec2cc3a19377be311a60a1c0e4a70ddd63ea89fae5df08ac' + 'ebbcac3a37787c86fa8515046d81d1d0bb2669215703d6fa2800233029bf3d63' + 'b07ce80f2e079cce08c8ec006dda091f6f73f158c8a62df5bac2fbabb6989849') +[[ $CARCH = x86_64 ]] && sha256sums[0]='3d994cc6c05198f4b6f07a213ac1e9e45a45159899e6c4a7feca5e6c395c3022' + +install=install + +_kernmajor="$(pacman -Q linux | awk '{print $2}' | cut -d - -f1 | cut -d . -f1,2)" +_extramodules="extramodules-${_kernmajor}-ARCH" +_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + +prepare() { + cd "${srcdir}" + + patch -p1 -i linux-recent.patch + patch -p1 -i license.patch + patch -p1 -i gcc.patch + + sed -e "/BRCM_WLAN_IFNAME/s:eth:wlan:" \ + -i src/wl/sys/wl_linux.c +} + +build() { + cd "${srcdir}" + + make -C /usr/lib/modules/${_kernver}/build M=`pwd` +} + +package() { + cd "${srcdir}" + + install -Dm644 wl.ko "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko" + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/wl.ko" + + install -Dm644 lib/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -Dm644 modprobe.d "${pkgdir}/usr/lib/modprobe.d/broadcom-wl.conf" +} diff --git a/gcc.patch b/gcc.patch new file mode 100644 index 000000000000..f93e3f1d3a3f --- /dev/null +++ b/gcc.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2014-06-26 10:42:08.000000000 +0000 ++++ b/Makefile 2014-07-17 22:44:01.662297228 +0000 +@@ -126,6 +126,8 @@ + EXTRA_CFLAGS += -I$(src)/src/shared/bcmwifi/include + #EXTRA_CFLAGS += -DBCMDBG_ASSERT -DBCMDBG_ERR + ++EXTRA_CFLAGS += -Wno-date-time ++ + EXTRA_LDFLAGS := $(src)/lib/wlc_hybrid.o_shipped + + KBASE ?= /lib/modules/`uname -r` diff --git a/install b/install new file mode 100644 index 000000000000..8daceacbb2b7 --- /dev/null +++ b/install @@ -0,0 +1,13 @@ +post_upgrade() { + for i in /usr/lib/modules/extramodules-* + do + if [ -f "$i/version" ] + then + depmod $(cat "$i/version") + fi + done +} + +post_install() { + post_upgrade +} diff --git a/license.patch b/license.patch new file mode 100644 index 000000000000..1719a99cab6c --- /dev/null +++ b/license.patch @@ -0,0 +1,10 @@ +--- a/src/wl/sys/wl_linux.c 2014-06-26 10:42:08.000000000 +0000 ++++ b/src/wl/sys/wl_linux.c 2014-07-17 22:44:26.254759666 +0000 +@@ -205,6 +205,7 @@ + + static int nompc = 0; + module_param(nompc, int, 0); ++MODULE_LICENSE("Mixed/Proprietary"); + + #ifdef quote_str + #undef quote_str diff --git a/linux-recent.patch b/linux-recent.patch new file mode 100644 index 000000000000..05e4e1303105 --- /dev/null +++ b/linux-recent.patch @@ -0,0 +1,340 @@ +--- a/src/wl/sys/wl_cfg80211_hybrid.c 2014-06-26 10:42:08.000000000 +0000 ++++ b/src/wl/sys/wl_cfg80211_hybrid.c 2014-12-30 17:02:13.602127370 +0000 +@@ -63,8 +63,13 @@ + static s32 wl_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_ibss_params *params); + static s32 wl_cfg80211_leave_ibss(struct wiphy *wiphy, struct net_device *dev); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + static s32 wl_cfg80211_get_station(struct wiphy *wiphy, + struct net_device *dev, u8 *mac, struct station_info *sinfo); ++#else ++static s32 wl_cfg80211_get_station(struct wiphy *wiphy, ++ struct net_device *dev, const u8 *mac, struct station_info *sinfo); ++#endif + static s32 wl_cfg80211_set_power_mgmt(struct wiphy *wiphy, + struct net_device *dev, bool enabled, s32 timeout); + static int wl_cfg80211_connect(struct wiphy *wiphy, struct net_device *dev, +@@ -1387,7 +1392,7 @@ + key_endian_to_host(&key); + + params.key_len = (u8) min_t(u8, DOT11_MAX_KEY_SIZE, key.len); +- memcpy(params.key, key.data, params.key_len); ++ memcpy((char *)params.key, key.data, params.key_len); + + if ((err = wl_dev_ioctl(dev, WLC_GET_WSEC, &wsec, sizeof(wsec)))) { + return err; +@@ -1421,9 +1426,15 @@ + return err; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0) + static s32 + wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, + u8 *mac, struct station_info *sinfo) ++#else ++static s32 ++wl_cfg80211_get_station(struct wiphy *wiphy, struct net_device *dev, ++ const u8 *mac, struct station_info *sinfo) ++#endif + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); + scb_val_t scb_val; +@@ -2010,9 +2021,15 @@ + + notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); + notify_ielen = le32_to_cpu(bi->ie_length); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0) + cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#else ++ cbss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, (const u8 *)(bi->BSSID.octet), ++ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#endif + + if (unlikely(!cbss)) + return -ENOMEM; +@@ -2071,7 +2088,26 @@ + wl_get_assoc_ies(wl); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ { ++ struct wl_bss_info *bi; ++ u16 bss_info_channel; ++ struct ieee80211_channel *channel; ++ u32 freq; ++ ++ bi = (struct wl_bss_info *)(wl->extra_buf + 4); ++ bss_info_channel = bi->ctl_ch ? bi->ctl_ch : CHSPEC_CHANNEL(bi->chanspec); ++ ++ freq = ieee80211_channel_to_frequency(bss_info_channel, ++ (bss_info_channel <= CH_MAX_2G_CHANNEL) ? ++ IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ); ++ ++ channel = ieee80211_get_channel(wl_to_wiphy(wl), freq); ++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL); ++ } ++#else + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL); ++#endif + set_bit(WL_STATUS_CONNECTED, &wl->status); + wl->profile->active = true; + } +@@ -2629,7 +2665,15 @@ + + void wl_cfg80211_detach(struct net_device *ndev) + { +- struct wl_cfg80211_priv *wl = ndev_to_wl(ndev); ++ struct wl_cfg80211_priv *wl; ++ struct wireless_dev *wdev; ++ ++ wdev = ndev->ieee80211_ptr; ++ if (wdev == NULL) { ++ printk(KERN_ERR "[%s()] in ndev=%p: IEEE80211ptr=%p\n", __FUNCTION__, ndev, wdev); ++ return; ++ } ++ wl = ndev_to_wl(ndev); + + wl_deinit_cfg80211_priv(wl); + wl_free_wdev(wl); +--- a/src/wl/sys/wl_dbg.h 2014-06-26 10:42:08.000000000 +0000 ++++ b/src/wl/sys/wl_dbg.h 2014-12-30 17:02:03.840957429 +0000 +@@ -55,10 +55,12 @@ + + #define WL_NONE(args) + ++#define FORCE_TRACE_LEVEL(fmt, ...) do { printk(KERN_ERR fmt, ## __VA_ARGS__); } while (0) /* ## is GCC specific syntax to remove comma when single arg */ ++ + #ifdef BCMDBG_ERR + #define WL_ERROR(args) WL_PRINT(args) + #else +-#define WL_ERROR(args) ++#define WL_ERROR(args) FORCE_TRACE_LEVEL args + #endif + #define WL_TRACE(args) + #define WL_APSTA_UPDN(args) +--- a/src/wl/sys/wl_linux.c 2014-06-26 10:42:08.000000000 +0000 ++++ b/src/wl/sys/wl_linux.c 2014-12-30 17:02:03.841957446 +0000 +@@ -878,7 +878,7 @@ + static SIMPLE_DEV_PM_OPS(wl_pm_ops, wl_suspend, wl_resume); + #endif + +-static struct pci_driver wl_pci_driver = { ++static struct pci_driver wl_pci_driver __refdata = { + .name = "wl", + .probe = wl_pci_probe, + .remove = __devexit_p(wl_remove), +@@ -1270,6 +1270,7 @@ + MFREE(wl->osh, wlif->dev, sizeof(struct net_device)); + #else + free_netdev(wlif->dev); ++ wlif->dev = NULL; + #endif + } + +@@ -1307,7 +1308,12 @@ + dev->priv = priv_link; + #else + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0)) + dev = alloc_netdev(sizeof(priv_link_t), intf_name, ether_setup); ++#else ++ dev = alloc_netdev(sizeof(priv_link_t), intf_name, NET_NAME_UNKNOWN, ++ ether_setup); ++#endif + if (!dev) { + WL_ERROR(("wl%d: %s: alloc_netdev failed\n", + (wl->pub)?wl->pub->unit:wlif->subunit, __FUNCTION__)); +@@ -1651,11 +1657,7 @@ + } + + WL_LOCK(wl); +- if (!capable(CAP_NET_ADMIN)) { +- bcmerror = BCME_EPERM; +- } else { +- bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); +- } ++ bcmerror = wlc_ioctl(wl->wlc, ioc.cmd, buf, ioc.len, wlif->wlcif); + WL_UNLOCK(wl); + + done1: +@@ -2455,8 +2457,10 @@ + p80211msg_t *phdr; + + len = sizeof(p80211msg_t) + oskb->len - D11_PHY_HDR_LEN; +- if ((skb = dev_alloc_skb(len)) == NULL) ++ if ((skb = dev_alloc_skb(len)) == NULL) { ++ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); + return; ++ } + + skb_put(skb, len); + phdr = (p80211msg_t*)skb->data; +@@ -2535,8 +2539,10 @@ + rtap_len = sizeof(wl_radiotap_ht_brcm_2_t); + + len = rtap_len + (oskb->len - D11_PHY_HDR_LEN); +- if ((skb = dev_alloc_skb(len)) == NULL) ++ if ((skb = dev_alloc_skb(len)) == NULL) { ++ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); + return; ++ } + + skb_put(skb, len); + +@@ -2664,8 +2670,10 @@ + len += amsdu_len; + } + +- if ((skb = dev_alloc_skb(len)) == NULL) ++ if ((skb = dev_alloc_skb(len)) == NULL) { ++ WL_ERROR(("in %s:%d [%s()] dev_alloc_skb() failure!", __FILE__, __LINE__, __FUNCTION__)); + return; ++ } + + skb_put(skb, len); + +@@ -2990,7 +2998,7 @@ + } + + void +-wl_set_monitor(wl_info_t *wl, int val) ++wl_set_monitor(wl_info_t *wl, int val) /* public => is called by wlc_hybrid.o_shipped */ + { + const char *devname; + wl_if_t *wlif; +@@ -3224,42 +3232,75 @@ + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + static int + wl_proc_read(char *buffer, char **start, off_t offset, int length, int *eof, void *data) ++{ ++ wl_info_t * wl = (wl_info_t *)data; + #else + static ssize_t +-wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *data) +-#endif ++wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp) + { +- wl_info_t * wl = (wl_info_t *)data; +- int to_user; +- int len; ++ wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#endif ++ int bcmerror, len; ++ int to_user = 0; ++ char tmp[8]; + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + if (offset > 0) { + *eof = 1; + return 0; + } ++#else ++ if (*offp > 0) { /* for example, stop: cat /proc/brcm_monitor0 */ ++ return 0; /* 0 <=> EOF */ ++ } + #endif + +- if (!length) { +- WL_ERROR(("%s: Not enough return buf space\n", __FUNCTION__)); +- return 0; +- } + WL_LOCK(wl); +- wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); +- len = sprintf(buffer, "%d\n", to_user); +- WL_UNLOCK(wl); +- return len; ++ bcmerror = wlc_ioctl(wl->wlc, WLC_GET_MONITOR, &to_user, sizeof(int), NULL); ++ WL_UNLOCK(wl); ++ ++ if (bcmerror != BCME_OK) { ++ WL_ERROR(("%s: GET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); ++ return -EIO; ++ } ++ ++ len = snprintf(tmp, ARRAY_SIZE(tmp), "%d\n", to_user); ++ tmp[ARRAY_SIZE(tmp) - 1] = '\0'; ++ if (len >= ARRAY_SIZE(tmp)) { ++ printk(KERN_ERR "%s:%d [%s()] output would be truncated (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len); ++ return -ERANGE; ++ } ++ else if (len < 0) { ++ printk(KERN_ERR "%s:%d [%s()] unable to convert value (ret=%d)!", __FILE__, __LINE__, __FUNCTION__, len); ++ return len; ++ } ++ if (length < len) { ++ printk(KERN_ERR "%s:%d [%s()] user buffer is too small (at least=%d ; user=%d)!", __FILE__, __LINE__, __FUNCTION__, len, (int)length); ++ return -EMSGSIZE; ++ } ++ if (copy_to_user(buffer, tmp, len) != 0) { ++ printk(KERN_ERR "%s:%d [%s()] unable to copy data!", __FILE__, __LINE__, __FUNCTION__); ++ return -EFAULT; ++ } ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++ *offp += len; ++#endif ++ ++ return len; + } + + #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + static int + wl_proc_write(struct file *filp, const char *buff, unsigned long length, void *data) ++{ ++ wl_info_t * wl = (wl_info_t *)data; + #else + static ssize_t +-wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *data) +-#endif ++wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp) + { +- wl_info_t * wl = (wl_info_t *)data; ++ wl_info_t * wl = PDE_DATA(file_inode(filp)); ++#endif + int from_user = 0; + int bcmerror; + +@@ -3270,7 +3311,11 @@ + } + if (copy_from_user(&from_user, buff, 1)) { + WL_ERROR(("%s: copy from user failed\n", __FUNCTION__)); +- return -EIO; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++ return -EIO; ++#else ++ return -EFAULT; ++#endif + } + + if (from_user >= 0x30) +@@ -3280,10 +3325,15 @@ + bcmerror = wlc_ioctl(wl->wlc, WLC_SET_MONITOR, &from_user, sizeof(int), NULL); + WL_UNLOCK(wl); + +- if (bcmerror < 0) { ++ if (bcmerror != BCME_OK) { + WL_ERROR(("%s: SET_MONITOR failed with %d\n", __FUNCTION__, bcmerror)); + return -EIO; + } ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0)) && 0 /* no need to update offset because this file should only trigger action... */ ++ *offp += length; ++#endif ++ + return length; + } + +@@ -3304,8 +3354,8 @@ + if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { + WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); + #else +- if ((wl->proc_entry = proc_create(tmp, 0644, NULL, &wl_fops)) == NULL) { +- WL_ERROR(("%s: proc_create %s failed\n", __FUNCTION__, tmp)); ++ if ((wl->proc_entry = proc_create_data(tmp, 0644, NULL, &wl_fops, wl)) == NULL) { ++ WL_ERROR(("%s: proc_create_data %s failed\n", __FUNCTION__, tmp)); + #endif + ASSERT(0); + return -1; diff --git a/modprobe.d b/modprobe.d new file mode 100644 index 000000000000..f09d4c17647c --- /dev/null +++ b/modprobe.d @@ -0,0 +1,5 @@ +blacklist b43 +blacklist ssb +blacklist bcma +blacklist brcmsmac +blacklist brcmfmac |