wok annotate 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
rev   line source
pascal@20321 1 --- src/wl/sys/wl_linux.c
pascal@20321 2 +++ src/wl/sys/wl_linux.c
pascal@20321 3 @@ -3180,6 +3180,7 @@
pascal@20321 4 {
pascal@20321 5 char tmp[32];
pascal@20321 6 sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
pascal@20321 7 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
pascal@20321 8 if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
pascal@20321 9 WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
pascal@20321 10 ASSERT(0);
pascal@20321 11 @@ -3188,5 +3189,17 @@
pascal@20321 12 wl->proc_entry->read_proc = wl_proc_read;
pascal@20321 13 wl->proc_entry->write_proc = wl_proc_write;
pascal@20321 14 wl->proc_entry->data = wl;
pascal@20321 15 +#else
pascal@20321 16 + static const struct file_operations wl_proc_fops = {
pascal@20321 17 + .owner = THIS_MODULE,
pascal@20321 18 + .read = wl_proc_read,
pascal@20321 19 + .write = wl_proc_write,
pascal@20321 20 + };
pascal@20321 21 + if ((wl->proc_entry = proc_create(tmp, 0644, NULL,&wl_proc_fops)) == NULL) {
pascal@20321 22 + WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
pascal@20321 23 + ASSERT(0);
pascal@20321 24 + return -1;
pascal@20321 25 + }
pascal@20321 26 +#endif
pascal@20321 27 return 0;
pascal@20321 28 }
pascal@20321 29 --- src/wl/sys/wl_cfg80211.c
pascal@20321 30 +++ src/wl/sys/wl_cfg80211.c
pascal@20321 31 @@ -1892,7 +1892,11 @@
pascal@20321 32 wl_get_assoc_ies(wl);
pascal@20321 33 memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
pascal@20321 34 wl_update_bss_info(wl);
pascal@20321 35 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)
pascal@20321 36 cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL
pascal@20321 37 );
pascal@20321 38 +#else
pascal@20321 39 + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, G
pascal@20321 40 FP_KERNEL);
pascal@20321 41 +#endif
pascal@20321 42 set_bit(WL_STATUS_CONNECTED, &wl->status);
pascal@20321 43 wl->profile->active = true;
pascal@20321 44 }
pascal@20321 45 @@ -2112,7 +2116,11 @@
pascal@20321 46 rcu_read_unlock();
pascal@20321 47 #endif
pascal@20321 48 beacon_interval = bss->beacon_interval;
pascal@20321 49 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
pascal@20321 50 cfg80211_put_bss(bss);
pascal@20321 51 +#else
pascal@20321 52 + cfg80211_put_bss(wl_to_wiphy(wl), bss);
pascal@20321 53 +#endif
pascal@20321 54 }
pascal@20321 55
pascal@20321 56 tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);
pascal@20321 57