tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

cfg80211: remove "channel" from survey names

All of the survey data is (currently) per channel anyway,
so having the word "channel" in the name does nothing. In
the next patch I'll introduce global data to the survey,
where the word "channel" is actually confusing.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

Johannes Berg 4ed20beb db12847c

+135 -127
+4 -4
drivers/net/wireless/ath/ath10k/wmi.c
··· 1344 1344 rx_clear_count -= ar->survey_last_rx_clear_count; 1345 1345 1346 1346 survey = &ar->survey[idx]; 1347 - survey->channel_time = WMI_CHAN_INFO_MSEC(cycle_count); 1348 - survey->channel_time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count); 1347 + survey->time = WMI_CHAN_INFO_MSEC(cycle_count); 1348 + survey->time_rx = WMI_CHAN_INFO_MSEC(rx_clear_count); 1349 1349 survey->noise = noise_floor; 1350 - survey->filled = SURVEY_INFO_CHANNEL_TIME | 1351 - SURVEY_INFO_CHANNEL_TIME_RX | 1350 + survey->filled = SURVEY_INFO_TIME | 1351 + SURVEY_INFO_TIME_RX | 1352 1352 SURVEY_INFO_NOISE_DBM; 1353 1353 } 1354 1354
+8 -8
drivers/net/wireless/ath/ath5k/mac80211-ops.c
··· 672 672 spin_lock_bh(&common->cc_lock); 673 673 ath_hw_cycle_counters_update(common); 674 674 if (cc->cycles > 0) { 675 - ah->survey.channel_time += cc->cycles / div; 676 - ah->survey.channel_time_busy += cc->rx_busy / div; 677 - ah->survey.channel_time_rx += cc->rx_frame / div; 678 - ah->survey.channel_time_tx += cc->tx_frame / div; 675 + ah->survey.time += cc->cycles / div; 676 + ah->survey.time_busy += cc->rx_busy / div; 677 + ah->survey.time_rx += cc->rx_frame / div; 678 + ah->survey.time_tx += cc->tx_frame / div; 679 679 } 680 680 memset(cc, 0, sizeof(*cc)); 681 681 spin_unlock_bh(&common->cc_lock); ··· 686 686 survey->noise = ah->ah_noise_floor; 687 687 survey->filled = SURVEY_INFO_NOISE_DBM | 688 688 SURVEY_INFO_IN_USE | 689 - SURVEY_INFO_CHANNEL_TIME | 690 - SURVEY_INFO_CHANNEL_TIME_BUSY | 691 - SURVEY_INFO_CHANNEL_TIME_RX | 692 - SURVEY_INFO_CHANNEL_TIME_TX; 689 + SURVEY_INFO_TIME | 690 + SURVEY_INFO_TIME_BUSY | 691 + SURVEY_INFO_TIME_RX | 692 + SURVEY_INFO_TIME_TX; 693 693 694 694 return 0; 695 695 }
+8 -8
drivers/net/wireless/ath/ath9k/link.c
··· 516 516 ath_hw_cycle_counters_update(common); 517 517 518 518 if (cc->cycles > 0) { 519 - survey->filled |= SURVEY_INFO_CHANNEL_TIME | 520 - SURVEY_INFO_CHANNEL_TIME_BUSY | 521 - SURVEY_INFO_CHANNEL_TIME_RX | 522 - SURVEY_INFO_CHANNEL_TIME_TX; 523 - survey->channel_time += cc->cycles / div; 524 - survey->channel_time_busy += cc->rx_busy / div; 525 - survey->channel_time_rx += cc->rx_frame / div; 526 - survey->channel_time_tx += cc->tx_frame / div; 519 + survey->filled |= SURVEY_INFO_TIME | 520 + SURVEY_INFO_TIME_BUSY | 521 + SURVEY_INFO_TIME_RX | 522 + SURVEY_INFO_TIME_TX; 523 + survey->time += cc->cycles / div; 524 + survey->time_busy += cc->rx_busy / div; 525 + survey->time_rx += cc->rx_frame / div; 526 + survey->time_tx += cc->tx_frame / div; 527 527 } 528 528 529 529 if (cc->cycles < div)
+6 -6
drivers/net/wireless/ath/carl9170/cmd.c
··· 188 188 189 189 if (ar->channel) { 190 190 info = &ar->survey[ar->channel->hw_value]; 191 - info->channel_time = ar->tally.active; 192 - info->channel_time_busy = ar->tally.cca; 193 - info->channel_time_tx = ar->tally.tx_time; 194 - do_div(info->channel_time, 1000); 195 - do_div(info->channel_time_busy, 1000); 196 - do_div(info->channel_time_tx, 1000); 191 + info->time = ar->tally.active; 192 + info->time_busy = ar->tally.cca; 193 + info->time_tx = ar->tally.tx_time; 194 + do_div(info->time, 1000); 195 + do_div(info->time_busy, 1000); 196 + do_div(info->time_tx, 1000); 197 197 } 198 198 } 199 199 return 0;
+3 -3
drivers/net/wireless/ath/carl9170/main.c
··· 1690 1690 survey->filled |= SURVEY_INFO_IN_USE; 1691 1691 1692 1692 if (ar->fw.hw_counters) { 1693 - survey->filled |= SURVEY_INFO_CHANNEL_TIME | 1694 - SURVEY_INFO_CHANNEL_TIME_BUSY | 1695 - SURVEY_INFO_CHANNEL_TIME_TX; 1693 + survey->filled |= SURVEY_INFO_TIME | 1694 + SURVEY_INFO_TIME_BUSY | 1695 + SURVEY_INFO_TIME_TX; 1696 1696 } 1697 1697 1698 1698 return 0;
+4 -3
drivers/net/wireless/mwifiex/cfg80211.c
··· 1037 1037 survey->channel = ieee80211_get_channel(wiphy, 1038 1038 ieee80211_channel_to_frequency(pchan_stats[idx].chan_num, band)); 1039 1039 survey->filled = SURVEY_INFO_NOISE_DBM | 1040 - SURVEY_INFO_CHANNEL_TIME | SURVEY_INFO_CHANNEL_TIME_BUSY; 1040 + SURVEY_INFO_TIME | 1041 + SURVEY_INFO_TIME_BUSY; 1041 1042 survey->noise = pchan_stats[idx].noise; 1042 - survey->channel_time = pchan_stats[idx].cca_scan_dur; 1043 - survey->channel_time_busy = pchan_stats[idx].cca_busy_dur; 1043 + survey->time = pchan_stats[idx].cca_scan_dur; 1044 + survey->time_busy = pchan_stats[idx].cca_busy_dur; 1044 1045 1045 1046 return 0; 1046 1047 }
+6 -6
drivers/net/wireless/mwl8k.c
··· 3098 3098 3099 3099 cca_cnt = ioread32(priv->regs + NOK_CCA_CNT_REG); 3100 3100 cca_cnt /= 1000; /* uSecs to mSecs */ 3101 - survey->channel_time_busy = (u64) cca_cnt; 3101 + survey->time_busy = (u64) cca_cnt; 3102 3102 3103 3103 rx_rdy = ioread32(priv->regs + BBU_RXRDY_CNT_REG); 3104 3104 rx_rdy /= 1000; /* uSecs to mSecs */ 3105 - survey->channel_time_rx = (u64) rx_rdy; 3105 + survey->time_rx = (u64) rx_rdy; 3106 3106 3107 3107 priv->channel_time = jiffies - priv->channel_time; 3108 - survey->channel_time = jiffies_to_msecs(priv->channel_time); 3108 + survey->time = jiffies_to_msecs(priv->channel_time); 3109 3109 3110 3110 survey->channel = channel; 3111 3111 ··· 3115 3115 survey->noise = nf * -1; 3116 3116 3117 3117 survey->filled = SURVEY_INFO_NOISE_DBM | 3118 - SURVEY_INFO_CHANNEL_TIME | 3119 - SURVEY_INFO_CHANNEL_TIME_BUSY | 3120 - SURVEY_INFO_CHANNEL_TIME_RX; 3118 + SURVEY_INFO_TIME | 3119 + SURVEY_INFO_TIME_BUSY | 3120 + SURVEY_INFO_TIME_RX; 3121 3121 } 3122 3122 3123 3123 /*
+3 -3
drivers/net/wireless/p54/eeprom.c
··· 196 196 dest->max_power = chan->max_power; 197 197 priv->survey[*chan_num].channel = &tmp->channels[j]; 198 198 priv->survey[*chan_num].filled = SURVEY_INFO_NOISE_DBM | 199 - SURVEY_INFO_CHANNEL_TIME | 200 - SURVEY_INFO_CHANNEL_TIME_BUSY | 201 - SURVEY_INFO_CHANNEL_TIME_TX; 199 + SURVEY_INFO_TIME | 200 + SURVEY_INFO_TIME_BUSY | 201 + SURVEY_INFO_TIME_TX; 202 202 dest->hw_value = (*chan_num); 203 203 j++; 204 204 (*chan_num)++;
+4 -4
drivers/net/wireless/p54/main.c
··· 305 305 struct survey_info *info = &priv->survey[chan->hw_value]; 306 306 307 307 /* only reset channel statistics, don't touch .filled, etc. */ 308 - info->channel_time = 0; 309 - info->channel_time_busy = 0; 310 - info->channel_time_tx = 0; 308 + info->time = 0; 309 + info->time_busy = 0; 310 + info->time_tx = 0; 311 311 } 312 312 313 313 priv->update_stats = true; ··· 636 636 637 637 if (in_use) { 638 638 /* test if the reported statistics are valid. */ 639 - if (survey->channel_time != 0) { 639 + if (survey->time != 0) { 640 640 survey->filled |= SURVEY_INFO_IN_USE; 641 641 } else { 642 642 /*
+6 -6
drivers/net/wireless/p54/txrx.c
··· 587 587 if (chan) { 588 588 struct survey_info *survey = &priv->survey[chan->hw_value]; 589 589 survey->noise = clamp(priv->noise, -128, 127); 590 - survey->channel_time = priv->survey_raw.active; 591 - survey->channel_time_tx = priv->survey_raw.tx; 592 - survey->channel_time_busy = priv->survey_raw.tx + 590 + survey->time = priv->survey_raw.active; 591 + survey->time_tx = priv->survey_raw.tx; 592 + survey->time_busy = priv->survey_raw.tx + 593 593 priv->survey_raw.cca; 594 - do_div(survey->channel_time, 1024); 595 - do_div(survey->channel_time_tx, 1024); 596 - do_div(survey->channel_time_busy, 1024); 594 + do_div(survey->time, 1024); 595 + do_div(survey->time_tx, 1024); 596 + do_div(survey->time_busy, 1024); 597 597 } 598 598 599 599 tmp = p54_find_and_unlink_skb(priv, hdr->req_id);
+6 -6
drivers/net/wireless/rt2x00/rt2800lib.c
··· 8020 8020 rt2800_register_read(rt2x00dev, CH_BUSY_STA_SEC, &busy_ext); 8021 8021 8022 8022 if (idle || busy) { 8023 - survey->filled = SURVEY_INFO_CHANNEL_TIME | 8024 - SURVEY_INFO_CHANNEL_TIME_BUSY | 8025 - SURVEY_INFO_CHANNEL_TIME_EXT_BUSY; 8023 + survey->filled = SURVEY_INFO_TIME | 8024 + SURVEY_INFO_TIME_BUSY | 8025 + SURVEY_INFO_TIME_EXT_BUSY; 8026 8026 8027 - survey->channel_time = (idle + busy) / 1000; 8028 - survey->channel_time_busy = busy / 1000; 8029 - survey->channel_time_ext_busy = busy_ext / 1000; 8027 + survey->time = (idle + busy) / 1000; 8028 + survey->time_busy = busy / 1000; 8029 + survey->time_ext_busy = busy_ext / 1000; 8030 8030 } 8031 8031 8032 8032 if (!(hw->conf.flags & IEEE80211_CONF_OFFCHANNEL))
+22 -22
include/net/cfg80211.h
··· 520 520 * 521 521 * @SURVEY_INFO_NOISE_DBM: noise (in dBm) was filled in 522 522 * @SURVEY_INFO_IN_USE: channel is currently being used 523 - * @SURVEY_INFO_CHANNEL_TIME: channel active time (in ms) was filled in 524 - * @SURVEY_INFO_CHANNEL_TIME_BUSY: channel busy time was filled in 525 - * @SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: extension channel busy time was filled in 526 - * @SURVEY_INFO_CHANNEL_TIME_RX: channel receive time was filled in 527 - * @SURVEY_INFO_CHANNEL_TIME_TX: channel transmit time was filled in 523 + * @SURVEY_INFO_TIME: active time (in ms) was filled in 524 + * @SURVEY_INFO_TIME_BUSY: busy time was filled in 525 + * @SURVEY_INFO_TIME_EXT_BUSY: extension channel busy time was filled in 526 + * @SURVEY_INFO_TIME_RX: receive time was filled in 527 + * @SURVEY_INFO_TIME_TX: transmit time was filled in 528 528 * 529 529 * Used by the driver to indicate which info in &struct survey_info 530 530 * it has filled in during the get_survey(). 531 531 */ 532 532 enum survey_info_flags { 533 - SURVEY_INFO_NOISE_DBM = 1<<0, 534 - SURVEY_INFO_IN_USE = 1<<1, 535 - SURVEY_INFO_CHANNEL_TIME = 1<<2, 536 - SURVEY_INFO_CHANNEL_TIME_BUSY = 1<<3, 537 - SURVEY_INFO_CHANNEL_TIME_EXT_BUSY = 1<<4, 538 - SURVEY_INFO_CHANNEL_TIME_RX = 1<<5, 539 - SURVEY_INFO_CHANNEL_TIME_TX = 1<<6, 533 + SURVEY_INFO_NOISE_DBM = BIT(0), 534 + SURVEY_INFO_IN_USE = BIT(1), 535 + SURVEY_INFO_TIME = BIT(2), 536 + SURVEY_INFO_TIME_BUSY = BIT(3), 537 + SURVEY_INFO_TIME_EXT_BUSY = BIT(4), 538 + SURVEY_INFO_TIME_RX = BIT(5), 539 + SURVEY_INFO_TIME_TX = BIT(6), 540 540 }; 541 541 542 542 /** ··· 546 546 * @filled: bitflag of flags from &enum survey_info_flags 547 547 * @noise: channel noise in dBm. This and all following fields are 548 548 * optional 549 - * @channel_time: amount of time in ms the radio spent on the channel 550 - * @channel_time_busy: amount of time the primary channel was sensed busy 551 - * @channel_time_ext_busy: amount of time the extension channel was sensed busy 552 - * @channel_time_rx: amount of time the radio spent receiving data 553 - * @channel_time_tx: amount of time the radio spent transmitting data 549 + * @time: amount of time in ms the radio was turn on (on the channel) 550 + * @time_busy: amount of time the primary channel was sensed busy 551 + * @time_ext_busy: amount of time the extension channel was sensed busy 552 + * @time_rx: amount of time the radio spent receiving data 553 + * @time_tx: amount of time the radio spent transmitting data 554 554 * 555 555 * Used by dump_survey() to report back per-channel survey information. 556 556 * ··· 559 559 */ 560 560 struct survey_info { 561 561 struct ieee80211_channel *channel; 562 - u64 channel_time; 563 - u64 channel_time_busy; 564 - u64 channel_time_ext_busy; 565 - u64 channel_time_rx; 566 - u64 channel_time_tx; 562 + u64 time; 563 + u64 time_busy; 564 + u64 time_ext_busy; 565 + u64 time_rx; 566 + u64 time_tx; 567 567 u32 filled; 568 568 s8 noise; 569 569 };
+17 -10
include/uapi/linux/nl80211.h
··· 2815 2815 * @NL80211_SURVEY_INFO_FREQUENCY: center frequency of channel 2816 2816 * @NL80211_SURVEY_INFO_NOISE: noise level of channel (u8, dBm) 2817 2817 * @NL80211_SURVEY_INFO_IN_USE: channel is currently being used 2818 - * @NL80211_SURVEY_INFO_CHANNEL_TIME: amount of time (in ms) that the radio 2818 + * @NL80211_SURVEY_INFO_TIME: amount of time (in ms) that the radio 2819 2819 * spent on this channel 2820 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY: amount of the time the primary 2820 + * @NL80211_SURVEY_INFO_TIME_BUSY: amount of the time the primary 2821 2821 * channel was sensed busy (either due to activity or energy detect) 2822 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY: amount of time the extension 2822 + * @NL80211_SURVEY_INFO_TIME_EXT_BUSY: amount of time the extension 2823 2823 * channel was sensed busy 2824 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_RX: amount of time the radio spent 2824 + * @NL80211_SURVEY_INFO_TIME_RX: amount of time the radio spent 2825 2825 * receiving data 2826 - * @NL80211_SURVEY_INFO_CHANNEL_TIME_TX: amount of time the radio spent 2826 + * @NL80211_SURVEY_INFO_TIME_TX: amount of time the radio spent 2827 2827 * transmitting data 2828 2828 * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number 2829 2829 * currently defined ··· 2834 2834 NL80211_SURVEY_INFO_FREQUENCY, 2835 2835 NL80211_SURVEY_INFO_NOISE, 2836 2836 NL80211_SURVEY_INFO_IN_USE, 2837 - NL80211_SURVEY_INFO_CHANNEL_TIME, 2838 - NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY, 2839 - NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY, 2840 - NL80211_SURVEY_INFO_CHANNEL_TIME_RX, 2841 - NL80211_SURVEY_INFO_CHANNEL_TIME_TX, 2837 + NL80211_SURVEY_INFO_TIME, 2838 + NL80211_SURVEY_INFO_TIME_BUSY, 2839 + NL80211_SURVEY_INFO_TIME_EXT_BUSY, 2840 + NL80211_SURVEY_INFO_TIME_RX, 2841 + NL80211_SURVEY_INFO_TIME_TX, 2842 2842 2843 2843 /* keep last */ 2844 2844 __NL80211_SURVEY_INFO_AFTER_LAST, 2845 2845 NL80211_SURVEY_INFO_MAX = __NL80211_SURVEY_INFO_AFTER_LAST - 1 2846 2846 }; 2847 + 2848 + /* keep old names for compatibility */ 2849 + #define NL80211_SURVEY_INFO_CHANNEL_TIME NL80211_SURVEY_INFO_TIME 2850 + #define NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY NL80211_SURVEY_INFO_TIME_BUSY 2851 + #define NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY NL80211_SURVEY_INFO_TIME_EXT_BUSY 2852 + #define NL80211_SURVEY_INFO_CHANNEL_TIME_RX NL80211_SURVEY_INFO_TIME_RX 2853 + #define NL80211_SURVEY_INFO_CHANNEL_TIME_TX NL80211_SURVEY_INFO_TIME_TX 2847 2854 2848 2855 /** 2849 2856 * enum nl80211_mntr_flags - monitor configuration flags
+10 -10
net/mac80211/ethtool.c
··· 175 175 data[i++] = (u8)survey.noise; 176 176 else 177 177 data[i++] = -1LL; 178 - if (survey.filled & SURVEY_INFO_CHANNEL_TIME) 179 - data[i++] = survey.channel_time; 178 + if (survey.filled & SURVEY_INFO_TIME) 179 + data[i++] = survey.time; 180 180 else 181 181 data[i++] = -1LL; 182 - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_BUSY) 183 - data[i++] = survey.channel_time_busy; 182 + if (survey.filled & SURVEY_INFO_TIME_BUSY) 183 + data[i++] = survey.time_busy; 184 184 else 185 185 data[i++] = -1LL; 186 - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_EXT_BUSY) 187 - data[i++] = survey.channel_time_ext_busy; 186 + if (survey.filled & SURVEY_INFO_TIME_EXT_BUSY) 187 + data[i++] = survey.time_ext_busy; 188 188 else 189 189 data[i++] = -1LL; 190 - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_RX) 191 - data[i++] = survey.channel_time_rx; 190 + if (survey.filled & SURVEY_INFO_TIME_RX) 191 + data[i++] = survey.time_rx; 192 192 else 193 193 data[i++] = -1LL; 194 - if (survey.filled & SURVEY_INFO_CHANNEL_TIME_TX) 195 - data[i++] = survey.channel_time_tx; 194 + if (survey.filled & SURVEY_INFO_TIME_TX) 195 + data[i++] = survey.time_tx; 196 196 else 197 197 data[i++] = -1LL; 198 198
+15 -15
net/wireless/nl80211.c
··· 6641 6641 if ((survey->filled & SURVEY_INFO_IN_USE) && 6642 6642 nla_put_flag(msg, NL80211_SURVEY_INFO_IN_USE)) 6643 6643 goto nla_put_failure; 6644 - if ((survey->filled & SURVEY_INFO_CHANNEL_TIME) && 6645 - nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME, 6646 - survey->channel_time)) 6644 + if ((survey->filled & SURVEY_INFO_TIME) && 6645 + nla_put_u64(msg, NL80211_SURVEY_INFO_TIME, 6646 + survey->time)) 6647 6647 goto nla_put_failure; 6648 - if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_BUSY) && 6649 - nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_BUSY, 6650 - survey->channel_time_busy)) 6648 + if ((survey->filled & SURVEY_INFO_TIME_BUSY) && 6649 + nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_BUSY, 6650 + survey->time_busy)) 6651 6651 goto nla_put_failure; 6652 - if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_EXT_BUSY) && 6653 - nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_EXT_BUSY, 6654 - survey->channel_time_ext_busy)) 6652 + if ((survey->filled & SURVEY_INFO_TIME_EXT_BUSY) && 6653 + nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_EXT_BUSY, 6654 + survey->time_ext_busy)) 6655 6655 goto nla_put_failure; 6656 - if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_RX) && 6657 - nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_RX, 6658 - survey->channel_time_rx)) 6656 + if ((survey->filled & SURVEY_INFO_TIME_RX) && 6657 + nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_RX, 6658 + survey->time_rx)) 6659 6659 goto nla_put_failure; 6660 - if ((survey->filled & SURVEY_INFO_CHANNEL_TIME_TX) && 6661 - nla_put_u64(msg, NL80211_SURVEY_INFO_CHANNEL_TIME_TX, 6662 - survey->channel_time_tx)) 6660 + if ((survey->filled & SURVEY_INFO_TIME_TX) && 6661 + nla_put_u64(msg, NL80211_SURVEY_INFO_TIME_TX, 6662 + survey->time_tx)) 6663 6663 goto nla_put_failure; 6664 6664 6665 6665 nla_nest_end(msg, infoattr);
+13 -13
net/wireless/trace.h
··· 1604 1604 WIPHY_ENTRY 1605 1605 CHAN_ENTRY 1606 1606 __field(int, ret) 1607 - __field(u64, channel_time) 1608 - __field(u64, channel_time_busy) 1609 - __field(u64, channel_time_ext_busy) 1610 - __field(u64, channel_time_rx) 1611 - __field(u64, channel_time_tx) 1607 + __field(u64, time) 1608 + __field(u64, time_busy) 1609 + __field(u64, time_ext_busy) 1610 + __field(u64, time_rx) 1611 + __field(u64, time_tx) 1612 1612 __field(u32, filled) 1613 1613 __field(s8, noise) 1614 1614 ), ··· 1616 1616 WIPHY_ASSIGN; 1617 1617 CHAN_ASSIGN(info->channel); 1618 1618 __entry->ret = ret; 1619 - __entry->channel_time = info->channel_time; 1620 - __entry->channel_time_busy = info->channel_time_busy; 1621 - __entry->channel_time_ext_busy = info->channel_time_ext_busy; 1622 - __entry->channel_time_rx = info->channel_time_rx; 1623 - __entry->channel_time_tx = info->channel_time_tx; 1619 + __entry->time = info->time; 1620 + __entry->time_busy = info->time_busy; 1621 + __entry->time_ext_busy = info->time_ext_busy; 1622 + __entry->time_rx = info->time_rx; 1623 + __entry->time_tx = info->time_tx; 1624 1624 __entry->filled = info->filled; 1625 1625 __entry->noise = info->noise; 1626 1626 ), ··· 1629 1629 "channel time extension busy: %llu, channel time rx: %llu, " 1630 1630 "channel time tx: %llu, filled: %u, noise: %d", 1631 1631 WIPHY_PR_ARG, __entry->ret, CHAN_PR_ARG, 1632 - __entry->channel_time, __entry->channel_time_busy, 1633 - __entry->channel_time_ext_busy, __entry->channel_time_rx, 1634 - __entry->channel_time_tx, __entry->filled, __entry->noise) 1632 + __entry->time, __entry->time_busy, 1633 + __entry->time_ext_busy, __entry->time_rx, 1634 + __entry->time_tx, __entry->filled, __entry->noise) 1635 1635 ); 1636 1636 1637 1637 TRACE_EVENT(rdev_tdls_oper,