Fix the misalignment with previous code and redundant comment

Author: dingsen-Greenhorn

vwifi.c

@@ -88,9 +88,8 @@ struct vwifi_vif {
     struct wireless_dev wdev;
     struct net_device *ndev;
     struct net_device_stats stats;
-    int manual_mcs;      /* ADDED: Store user-specified MCS */
-    bool manual_mcs_set; /* ADDED: Flag to indicate manual MCS override */
-
+    int manual_mcs;
+    bool manual_mcs_set;
     size_t ssid_len;
     /* Currently connected BSS id */
     u8 bssid[ETH_ALEN];
@@ -1406,7 +1405,7 @@ static int vwifi_get_station(struct wiphy *wiphy,
     sinfo->rx_bytes = vif->stats.rx_bytes;
 
 
-    /* Log byte counters for debugging */ /* CHANGED */
+    /* Log byte counters for debugging */
     pr_info(
         "vwifi: Station %pM tx_bytes %llu, rx_bytes %llu, tx_packets %u, "
         "rx_packets %u, tx_failed %u\n",
@@ -1415,8 +1414,7 @@ static int vwifi_get_station(struct wiphy *wiphy,
 
     /* For CFG80211_SIGNAL_TYPE_MBM, value is expressed in dBm */
     sinfo->signal = rand_int_smooth(-100, -30, jiffies);
-    pr_info("vwifi: Station %pM signal %d dBm (raw)\n", mac,
-            sinfo->signal); /* ADDED */
+    pr_info("vwifi: Station %pM signal %d dBm (raw)\n", mac, sinfo->signal);
     sinfo->inactive_time = jiffies_to_msecs(jiffies - vif->active_time);
     /*
      * Using 802.11n (HT) as the PHY, configure as follows:
@@ -1743,8 +1741,13 @@ static int vwifi_start_ap(struct wiphy *wiphy,
 
     /* Initialize hrtimer of beacon */
     pr_info("vwifi: init beacon_timer.\n");
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
+    hrtimer_setup(&vif->beacon_timer, vwifi_beacon, CLOCK_MONOTONIC,
+                  HRTIMER_MODE_ABS_SOFT);
+#else
     hrtimer_init(&vif->beacon_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_SOFT);
     vif->beacon_timer.function = vwifi_beacon;
+#endif
 
     if (!hrtimer_is_queued(&vif->beacon_timer)) {
         u64 tsf, until_tbtt;