diff --git a/kernel/drivers/module-broadcom-wl/actions.py b/kernel/drivers/module-broadcom-wl/actions.py old mode 100644 new mode 100755 index a53f56d2..4b88c35d --- a/kernel/drivers/module-broadcom-wl/actions.py +++ b/kernel/drivers/module-broadcom-wl/actions.py @@ -13,11 +13,11 @@ WorkDir = get.ARCH() KDIR = kerneltools.getKernelVersion() def build(): - shelltools.system("sed -e '/BRCM_WLAN_IFNAME/s:eth:wlan:' \ - -i src/wl/sys/wl_linux.c") + #shelltools.system("sed -e '/BRCM_WLAN_IFNAME/s:eth:wlan:' \ + #-i src/wl/sys/wl_linux.c") autotools.make("Werror=0 -C /lib/modules/%s/build M=%s modules" % (KDIR, get.curDIR())) def install(): pisitools.insinto("/lib/modules/%s/extra" % KDIR, "wl.ko") - pisitools.dodoc("lib/LICENSE.txt") \ No newline at end of file + pisitools.dodoc("lib/LICENSE.txt") diff --git a/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl b/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-alias.conf b/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-alias.conf old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-blacklist.conf b/kernel/drivers/module-broadcom-wl/files/conf/broadcom-wl-blacklist.conf old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/files/linux-4.11.patch b/kernel/drivers/module-broadcom-wl/files/linux-4.11.patch new file mode 100755 index 00000000..a779f8c8 --- /dev/null +++ b/kernel/drivers/module-broadcom-wl/files/linux-4.11.patch @@ -0,0 +1,52 @@ +diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c +index a9671e2..da36405 100644 +--- a/src/wl/sys/wl_cfg80211_hybrid.c ++++ b/src/wl/sys/wl_cfg80211_hybrid.c +@@ -30,6 +30,9 @@ + #include + #include + #include ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++#include ++#endif + #include + #include + #include +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -117,6 +117,9 @@ int wl_found = 0; + + typedef struct priv_link { + wl_if_t *wlif; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ unsigned long last_rx; ++#endif + } priv_link_t; + + #define WL_DEV_IF(dev) ((wl_if_t*)((priv_link_t*)DEV_PRIV(dev))->wlif) +@@ -2450,6 +2453,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + { + struct sk_buff *oskb = (struct sk_buff *)p; + struct sk_buff *skb; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link_t *priv_link; ++#endif + uchar *pdata; + uint len; + +@@ -2916,7 +2922,13 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p) + if (skb == NULL) return; + + skb->dev = wl->monitor_dev; ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0) ++ priv_link = MALLOC(wl->osh, sizeof(priv_link_t)); ++ priv_link = netdev_priv(skb->dev); ++ priv_link->last_rx = jiffies; ++#else + skb->dev->last_rx = jiffies; ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) + skb_reset_mac_header(skb); + #else diff --git a/kernel/drivers/module-broadcom-wl/files/linux-4.12.patch b/kernel/drivers/module-broadcom-wl/files/linux-4.12.patch new file mode 100755 index 00000000..94c6253f --- /dev/null +++ b/kernel/drivers/module-broadcom-wl/files/linux-4.12.patch @@ -0,0 +1,64 @@ +diff -ru work.orig/src/wl/sys/wl_cfg80211_hybrid.c work.patched/src/wl/sys/wl_cfg80211_hybrid.c +--- work.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:50:27.328823384 -0700 ++++ work.patched/src/wl/sys/wl_cfg80211_hybrid.c 2017-06-10 15:52:40.540809187 -0700 +@@ -52,8 +52,13 @@ + u32 wl_dbg_level = WL_DBG_ERR; + #endif + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++ enum nl80211_iftype type, struct vif_params *params); ++#else + static s32 wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, + enum nl80211_iftype type, u32 *flags, struct vif_params *params); ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0) + static s32 + wl_cfg80211_scan(struct wiphy *wiphy, +@@ -466,7 +471,11 @@ + + static s32 + wl_cfg80211_change_iface(struct wiphy *wiphy, struct net_device *ndev, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ enum nl80211_iftype type, ++#else + enum nl80211_iftype type, u32 *flags, ++#endif + struct vif_params *params) + { + struct wl_cfg80211_priv *wl = wiphy_to_wl(wiphy); +@@ -2361,12 +2370,26 @@ + const wl_event_msg_t *e, void *data) + { + struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ struct cfg80211_roam_info roam_info = {}; ++#endif + s32 err = 0; + + wl_get_assoc_ies(wl); + memcpy(wl->profile->bssid, &e->addr, ETHER_ADDR_LEN); + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); + wl_update_bss_info(wl); ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0) ++ roam_info.channel = &wl->conf->channel, ++ roam_info.bssid = (u8 *)&wl->bssid, ++ roam_info.req_ie = conn_info->req_ie, ++ roam_info.req_ie_len = conn_info->req_ie_len, ++ roam_info.resp_ie = conn_info->resp_ie, ++ roam_info.resp_ie_len = conn_info->resp_ie_len, ++ ++ cfg80211_roamed(ndev, &roam_info, GFP_KERNEL); ++#else + cfg80211_roamed(ndev, + #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) + &wl->conf->channel, +@@ -2374,6 +2397,7 @@ + (u8 *)&wl->bssid, + conn_info->req_ie, conn_info->req_ie_len, + conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL); ++#endif + WL_DBG(("Report roaming result\n")); + + set_bit(WL_STATUS_CONNECTED, &wl->status); diff --git a/kernel/drivers/module-broadcom-wl/files/linux-4.15.patch b/kernel/drivers/module-broadcom-wl/files/linux-4.15.patch new file mode 100755 index 00000000..91c4d895 --- /dev/null +++ b/kernel/drivers/module-broadcom-wl/files/linux-4.15.patch @@ -0,0 +1,63 @@ +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -93,7 +93,11 @@ + + #include + ++#ifdef HAVE_TIMER_SETUP ++static void wl_timer(struct timer_list *list); ++#else + static void wl_timer(ulong data); ++#endif + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + +@@ -2296,12 +2300,17 @@ + + atomic_dec(&t->wl->callbacks); + } +- ++#ifdef HAVE_TIMER_SETUP ++static void ++wl_timer(struct timer_list *list) ++{ ++ wl_timer_t *t = from_timer(t,list,timer); ++#else + static void + wl_timer(ulong data) + { + wl_timer_t *t = (wl_timer_t *)data; +- ++#endif + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); + else +@@ -2351,10 +2360,13 @@ + } + + bzero(t, sizeof(wl_timer_t)); +- ++#ifdef HAVE_TIMER_SETUP ++ timer_setup(&t->timer, wl_timer,0); ++#else + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; ++#endif + t->wl = wl; + t->fn = fn; + t->arg = arg; +diff --git a/src/wl/sys/wl_linux.h b/src/wl/sys/wl_linux.h +index 489c9f5..f8278ad 100644 +--- a/src/wl/sys/wl_linux.h ++++ b/src/wl/sys/wl_linux.h +@@ -190,3 +190,7 @@ + extern struct net_device * wl_netdev_get(wl_info_t *wl); + + #endif ++ ++#if defined(timer_setup) && defined(from_timer) ++#define HAVE_TIMER_SETUP ++#endif diff --git a/kernel/drivers/module-broadcom-wl/files/patch/license.patch b/kernel/drivers/module-broadcom-wl/files/patch/license.patch old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/files/patch/linux47.patch b/kernel/drivers/module-broadcom-wl/files/patch/linux47.patch old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/files/patch/linux48.patch b/kernel/drivers/module-broadcom-wl/files/patch/linux48.patch old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/files/patch/wl_linux.c.patch b/kernel/drivers/module-broadcom-wl/files/patch/wl_linux.c.patch old mode 100644 new mode 100755 diff --git a/kernel/drivers/module-broadcom-wl/pspec.xml b/kernel/drivers/module-broadcom-wl/pspec.xml old mode 100644 new mode 100755 index 19d6fd08..b51389ba --- a/kernel/drivers/module-broadcom-wl/pspec.xml +++ b/kernel/drivers/module-broadcom-wl/pspec.xml @@ -15,20 +15,23 @@ https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_271.tar.gz https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_271.tar.gz - kernel-module-headers + kernel-module-headers patch/license.patch patch/wl_linux.c.patch patch/linux47.patch patch/linux48.patch + linux-4.11.patch + linux-4.12.patch + linux-4.15.patch module-broadcom-wl - kernel + kernel module-broadcom-wl-userspace @@ -57,6 +60,13 @@ + + 2018-07-12 + 6.30.223.271 + Rebuild for new kernel + Kamil Atlı + suvari@pisilinux.org + 2018-04-28 6.30.223.271 diff --git a/kernel/drivers/module-broadcom-wl/translations.xml b/kernel/drivers/module-broadcom-wl/translations.xml old mode 100644 new mode 100755