wok-current diff broadcom-wl/stuff/3.14.0.patch @ rev 20321
Fix busybox, etherboot & mgetty
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun May 20 21:26:43 2018 +0200 (2018-05-20) |
parents | |
children | 564f7f9745bd |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/broadcom-wl/stuff/3.14.0.patch Sun May 20 21:26:43 2018 +0200 1.3 @@ -0,0 +1,57 @@ 1.4 +--- src/wl/sys/wl_linux.c 1.5 ++++ src/wl/sys/wl_linux.c 1.6 +@@ -3180,6 +3180,7 @@ 1.7 + { 1.8 + char tmp[32]; 1.9 + sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit); 1.10 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) 1.11 + if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) { 1.12 + WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); 1.13 + ASSERT(0); 1.14 +@@ -3188,5 +3189,17 @@ 1.15 + wl->proc_entry->read_proc = wl_proc_read; 1.16 + wl->proc_entry->write_proc = wl_proc_write; 1.17 + wl->proc_entry->data = wl; 1.18 ++#else 1.19 ++ static const struct file_operations wl_proc_fops = { 1.20 ++ .owner = THIS_MODULE, 1.21 ++ .read = wl_proc_read, 1.22 ++ .write = wl_proc_write, 1.23 ++ }; 1.24 ++ if ((wl->proc_entry = proc_create(tmp, 0644, NULL,&wl_proc_fops)) == NULL) { 1.25 ++ WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp)); 1.26 ++ ASSERT(0); 1.27 ++ return -1; 1.28 ++ } 1.29 ++#endif 1.30 + return 0; 1.31 + } 1.32 +--- src/wl/sys/wl_cfg80211.c 1.33 ++++ src/wl/sys/wl_cfg80211.c 1.34 +@@ -1892,7 +1892,11 @@ 1.35 + wl_get_assoc_ies(wl); 1.36 + memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN); 1.37 + wl_update_bss_info(wl); 1.38 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0) 1.39 + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL 1.40 +); 1.41 ++#else 1.42 ++ cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, G 1.43 +FP_KERNEL); 1.44 ++#endif 1.45 + set_bit(WL_STATUS_CONNECTED, &wl->status); 1.46 + wl->profile->active = true; 1.47 + } 1.48 +@@ -2112,7 +2116,11 @@ 1.49 + rcu_read_unlock(); 1.50 + #endif 1.51 + beacon_interval = bss->beacon_interval; 1.52 ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) 1.53 + cfg80211_put_bss(bss); 1.54 ++#else 1.55 ++ cfg80211_put_bss(wl_to_wiphy(wl), bss); 1.56 ++#endif 1.57 + } 1.58 + 1.59 + tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM); 1.60 +