wok annotate broadcom-wl/stuff/3.14.0.patch @ rev 23495

updated python-humanize (0.5.1 -> 1.0.0)
author Hans-G?nter Theisgen
date Mon Apr 06 07:04:00 2020 +0100 (2020-04-06)
parents fb26906597c0
children
rev   line source
pascal@20324 1 --- a/amd64/src/wl/sys/wl_linux.c
pascal@20324 2 +++ a/amd64/src/wl/sys/wl_linux.c
pascal@20390 3 @@ -1192,7 +1192,11 @@
pascal@20390 4 #else
pascal@20390 5 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29))
pascal@20390 6
pascal@20390 7 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 17, 0))
pascal@20390 8 dev = alloc_netdev(sizeof(wl_if_t), name, ether_setup);
pascal@20390 9 +#else
pascal@20390 10 + dev = alloc_netdev(sizeof(wl_if_t), name, NET_NAME_UNKNOWN, ether_setup);
pascal@20390 11 +#endif
pascal@20390 12 wlif = netdev_priv(dev);
pascal@20390 13 if (!dev) {
pascal@20390 14 #else
pascal@20390 15 @@ -3180,6 +3184,7 @@
pascal@20321 16 {
pascal@20321 17 char tmp[32];
pascal@20321 18 sprintf(tmp, "%s%d", HYBRID_PROC, wl->pub->unit);
pascal@20321 19 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0)
pascal@20321 20 if ((wl->proc_entry = create_proc_entry(tmp, 0644, NULL)) == NULL) {
pascal@20321 21 WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
pascal@20321 22 ASSERT(0);
pascal@20390 23 @@ -3188,5 +3193,17 @@
pascal@20321 24 wl->proc_entry->read_proc = wl_proc_read;
pascal@20321 25 wl->proc_entry->write_proc = wl_proc_write;
pascal@20321 26 wl->proc_entry->data = wl;
pascal@20321 27 +#else
pascal@20321 28 + static const struct file_operations wl_proc_fops = {
pascal@20321 29 + .owner = THIS_MODULE,
pascal@20321 30 + .read = wl_proc_read,
pascal@20321 31 + .write = wl_proc_write,
pascal@20321 32 + };
pascal@20321 33 + if ((wl->proc_entry = proc_create(tmp, 0644, NULL,&wl_proc_fops)) == NULL) {
pascal@20321 34 + WL_ERROR(("%s: create_proc_entry %s failed\n", __FUNCTION__, tmp));
pascal@20321 35 + ASSERT(0);
pascal@20321 36 + return -1;
pascal@20321 37 + }
pascal@20321 38 +#endif
pascal@20321 39 return 0;
pascal@20321 40 }
pascal@20324 41 --- a/amd64/src/wl/sys/wl_cfg80211.c
pascal@20324 42 +++ a/amd64/src/wl/sys/wl_cfg80211.c
pascal@20390 43 @@ -1838,8 +1838,13 @@
pascal@20390 44 mgmt->u.beacon.capab_info, &bi->BSSID));
pascal@20390 45
pascal@20390 46 signal = notif_bss_info->rssi * 100;
pascal@20390 47 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
pascal@20390 48 if (!cfg80211_inform_bss_frame(wiphy, channel, mgmt,
pascal@20390 49 le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL)) {
pascal@20390 50 +#else
pascal@20390 51 + if (!cfg80211_inform_bss_frame(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, mgmt,
pascal@20390 52 + le16_to_cpu(notif_bss_info->frame_len), signal, GFP_KERNEL)) {
pascal@20390 53 +#endif
pascal@20390 54 WL_ERR(("cfg80211_inform_bss_frame error\n"));
pascal@20390 55 kfree(notif_bss_info);
pascal@20390 56 return -EINVAL;
pascal@20390 57 @@ -1857,6 +1862,12 @@
pascal@20390 58 u32 event = EVENT_TYPE(e);
pascal@20390 59 u16 flags = EVENT_FLAGS(e);
pascal@20390 60 u32 status = EVENT_STATUS(e);
pascal@20391 61 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
pascal@20390 62 + struct ieee80211_channel *channel = NULL;
pascal@20390 63 + struct wiphy *wiphy;
pascal@20390 64 + u32 chanspec, chan;
pascal@20390 65 + u32 freq, band;
pascal@20390 66 +#endif
pascal@20390 67
pascal@20390 68 WL_DBG(("\n"));
pascal@20390 69
pascal@20390 70 @@ -1868,7 +1879,11 @@
pascal@20390 71 }
pascal@20390 72 else if ((event == WLC_E_LINK && ~(flags & WLC_EVENT_MSG_LINK)) ||
pascal@20390 73 event == WLC_E_DEAUTH_IND || event == WLC_E_DISASSOC_IND) {
pascal@20390 74 +#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
pascal@20390 75 cfg80211_disconnected(ndev, 0, NULL, 0, GFP_KERNEL);
pascal@20390 76 +#else
pascal@20390 77 + cfg80211_disconnected(ndev, 0, NULL, 0, false, GFP_KERNEL);
pascal@20390 78 +#endif
pascal@20390 79 clear_bit(WL_STATUS_CONNECTED, &wl->status);
pascal@20390 80 wl_link_down(wl);
pascal@20390 81 wl_init_prof(wl->profile);
pascal@20390 82 @@ -1892,7 +1907,21 @@
pascal@20324 83 wl_get_assoc_ies(wl);
pascal@20324 84 memcpy(&wl->bssid, &e->addr, ETHER_ADDR_LEN);
pascal@20324 85 wl_update_bss_info(wl);
pascal@20391 86 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0)
pascal@20390 87 + wiphy = wl_to_wiphy(wl);
pascal@20390 88 + err = wl_dev_intvar_get(ndev, "chanspec", &chanspec);
pascal@20390 89 + if (err) {
pascal@20390 90 + WL_ERR(("Could not get chanspec, err %d\n", err));
pascal@20390 91 + return err;
pascal@20390 92 + }
pascal@20390 93 + chan = wf_chspec_ctlchan(chanspec);
pascal@20390 94 + band = (chan <= CH_MAX_2G_CHANNEL) ? IEEE80211_BAND_2GHZ : IEEE80211_BAND_5GHZ;
pascal@20390 95 + freq = ieee80211_channel_to_frequency(chan, band);
pascal@20390 96 + channel = ieee80211_get_channel(wiphy, freq);
pascal@20390 97 + cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, channel, GFP_KERNEL);
pascal@20390 98 +#else
pascal@20324 99 cfg80211_ibss_joined(ndev, (u8 *)&wl->bssid, GFP_KERNEL);
pascal@20321 100 +#endif
pascal@20324 101 set_bit(WL_STATUS_CONNECTED, &wl->status);
pascal@20324 102 wl->profile->active = true;
pascal@20324 103 }
pascal@20390 104 @@ -2112,7 +2141,11 @@
pascal@20390 105 rcu_read_unlock();
pascal@20390 106 #endif
pascal@20390 107 beacon_interval = bss->beacon_interval;
pascal@20390 108 +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)
pascal@20390 109 cfg80211_put_bss(bss);
pascal@20390 110 +#else
pascal@20390 111 + cfg80211_put_bss(wl_to_wiphy(wl), bss);
pascal@20390 112 +#endif
pascal@20390 113 }
pascal@20390 114
pascal@20390 115 tim = bcm_parse_tlvs(ie, ie_len, WLAN_EID_TIM);