Modify the terminology

Modify the terminology by replacing the abbreviation ah with ibss
in vwifi.c to align with cfg80211 kernel functions.
Additionally, change the IBSS network names in the test scripts to
ibss1, ibss2, and so on.

Author: jychen0611

scripts/verify.sh

@@ -160,34 +160,34 @@ if [ $final_ret -eq 0 ]; then
         final_ret=7
     fi
 
-    # vw3 becomes an IBSS and then joins the "Elian" network (BSSID: 00:76:77:33:00:00).
+    # vw3 becomes an IBSS and then joins the "ibss1" network (BSSID: 00:76:77:33:00:00).
     echo 
     echo "=================================="
-    echo "vw3 join Elian (00:76:77:33:00:00)"
+    echo "vw3 join ibss1 (00:76:77:33:00:00)"
     echo "=================================="
     sudo ip netns exec ns3 iw dev vw3 set type ibss
-    sudo ip netns exec ns3 iw dev vw3 ibss join Elian 2412 NOHT fixed-freq 00:76:77:33:00:00 beacon-interval 200
+    sudo ip netns exec ns3 iw dev vw3 ibss join ibss1 2412 NOHT fixed-freq 00:76:77:33:00:00 beacon-interval 200
 
-    # vw4 becomes an IBSS and then joins the "Elian" network (BSSID: 00:76:77:33:00:00).
+    # vw4 becomes an IBSS and then joins the "ibss1" network (BSSID: 00:76:77:33:00:00).
     echo 
     echo "=================================="
-    echo "vw4 join Elian (00:76:77:33:00:00)"
+    echo "vw4 join ibss1 (00:76:77:33:00:00)"
     echo "=================================="
     sudo ip netns exec ns4 iw dev vw4 set type ibss
-    sudo ip netns exec ns4 iw dev vw4 ibss join Elian 2412 NOHT fixed-freq 00:76:77:33:00:00 beacon-interval 200
+    sudo ip netns exec ns4 iw dev vw4 ibss join ibss1 2412 NOHT fixed-freq 00:76:77:33:00:00 beacon-interval 200
 
-    # vw5 becomes an IBSS and then joins the "Ricky" network (BSSID: 00:76:77:35:00:00).
+    # vw5 becomes an IBSS and then joins the "ibss2" network (BSSID: 00:76:77:35:00:00).
     echo 
     echo "=================================="
-    echo "vw5 join Ricky (00:76:77:35:00:00)"
+    echo "vw5 join ibss2 (00:76:77:35:00:00)"
     echo "=================================="
     sudo ip netns exec ns5 iw dev vw5 set type ibss
-    sudo ip netns exec ns5 iw dev vw5 ibss join Ricky 2412 NOHT fixed-freq 00:76:77:35:00:00 beacon-interval 300 
+    sudo ip netns exec ns5 iw dev vw5 ibss join ibss2 2412 NOHT fixed-freq 00:76:77:35:00:00 beacon-interval 300 
 
     # ping test: IBSS vw3 <--> STA vw2, should fail
     echo
     echo "================================================================================"
-    echo "Ping Test: IBSS vw3 (10.0.0.4) (in Elian) <--> STA vw2 (10.0.0.3)"
+    echo "Ping Test: IBSS vw3 (10.0.0.4) (in ibss1) <--> STA vw2 (10.0.0.3)"
     echo
     echo "(should fail)"
     echo "(be patient, it will take some time to route...)"
@@ -197,7 +197,7 @@ if [ $final_ret -eq 0 ]; then
     # ping test: IBSS vw3 <--> IBSS vw5, should fail 
     echo
     echo "================================================================================"
-    echo "Ping Test: IBSS vw3 (10.0.0.4) (in Elian) <--> IBSS vw5 (10.0.0.6) (in Ricky)"
+    echo "Ping Test: IBSS vw3 (10.0.0.4) (in ibss1) <--> IBSS vw5 (10.0.0.6) (in ibss2)"
     echo
     echo "(should fail)"
     echo "(be patient, it will take some time to route...)"
@@ -207,7 +207,7 @@ if [ $final_ret -eq 0 ]; then
     # ping test: IBSS vw3 <--> IBSS vw4, should success 
     echo
     echo "================================================================================"
-    echo "Ping Test: IBSS vw3 (10.0.0.4) (in Elian) <--> IBSS vw4 (10.0.0.5) (in Elian)"
+    echo "Ping Test: IBSS vw3 (10.0.0.4) (in ibss1) <--> IBSS vw4 (10.0.0.5) (in ibss1)"
     echo
     echo "(should success)"
     echo "(be patient, it will take some time to route...)"

vwifi.c

@@ -82,7 +82,7 @@ static atomic_t vwifi_wiphy_counter = ATOMIC_INIT(0);
 
 /* Virtual interface pointed to by netdev_priv(). Fields in the structure are
  * interface-dependent. Every interface has its own vwifi_vif, regardless of the
- * interface mode (STA, AP, Ad-hoc...).
+ * interface mode (STA, AP, IBSS...).
  */
 struct vwifi_vif {
     struct wireless_dev wdev;
@@ -104,7 +104,7 @@ struct vwifi_vif {
 
     struct mutex lock;
 
-    /* Split logic for STA and AP mode */
+    /* Split logic for the interface mode */
     union {
         /* Structure for STA mode */
         struct {
@@ -139,46 +139,46 @@ struct vwifi_vif {
             struct ieee80211_channel *channel;
             enum nl80211_chan_width bw;
         };
-        /* Structure for AD-HOC mode */
+        /* Structure for IBSS(ad hoc) mode */
         struct {
             /* List node for storing ibss devices (vwifi->ibss_list is the
-             * head), this field is for interface in AD-HOC mode.
+             * head), this field is for interface in IBSS mode.
              */
             struct list_head ibss_list;
             /* defines the channel to use if no other IBSS to join can be found
              */
-            struct cfg80211_chan_def ah_chandef;
-            u16 ah_beacon_int;
+            struct cfg80211_chan_def ibss_chandef;
+            u16 ibss_beacon_int;
             /* bitmap of basic rates */
-            u32 ah_basic_rates;
+            u32 ibss_basic_rates;
             /* The channel should be fixed -- do not search for IBSSs to join on
              * other channels. */
-            bool ah_channel_fixed;
+            bool ibss_channel_fixed;
             /* This is a protected network, keys will be configured after
              * joining */
-            bool ah_privacy;
+            bool ibss_privacy;
             /* whether user space controls IEEE 802.1X port, i.e.,
              * sets/clears %NL80211_STA_FLAG_AUTHORIZED. If true, the driver is
              * required to assume that the port is unauthorized until authorized
              * by user space. Otherwise, port is marked authorized by default.
              */
-            bool ah_control_port;
+            bool ibss_control_port;
             /* TRUE if userspace expects to exchange control
              * port frames over NL80211 instead of the network interface.
              */
-            bool ah_control_port_over_nl80211;
+            bool ibss_control_port_over_nl80211;
             /* whether user space controls DFS operation */
-            bool ah_userspace_handles_dfs;
+            bool ibss_userspace_handles_dfs;
             /* per-band multicast rate index + 1 (0: disabled) */
-            int ah_mcast_rate[NUM_NL80211_BANDS];
+            int ibss_mcast_rate[NUM_NL80211_BANDS];
             /* HT Capabilities over-rides. */
-            struct ieee80211_ht_cap ah_ht_capa;
+            struct ieee80211_ht_cap ibss_ht_capa;
             /* The bits of ht_capa which are to be used. */
-            struct ieee80211_ht_cap ah_ht_capa_mask;
+            struct ieee80211_ht_cap ibss_ht_capa_mask;
             /* static WEP keys */
-            struct key_params *ah_wep_keys;
+            struct key_params *ibss_wep_keys;
             /* key index (0..3) of the default TX static WEP key */
-            int ah_wep_tx_key;
+            int ibss_wep_tx_key;
         };
     };
 
@@ -551,7 +551,7 @@ static void inform_bss(struct vwifi_vif *vif)
 /* Helper function that prepares a structure with self-defined BSS information
  * and "informs" the kernel about the "new" Independent BSS.
  */
-static void ah_inform_bss(struct vwifi_vif *vif)
+static void ibss_inform_bss(struct vwifi_vif *vif)
 {
     struct vwifi_vif *ibss;
 
@@ -567,7 +567,7 @@ static void ah_inform_bss(struct vwifi_vif *vif)
         };
         int capability = WLAN_CAPABILITY_IBSS;
 
-        if (ibss->ah_privacy)
+        if (ibss->ibss_privacy)
             capability |= WLAN_CAPABILITY_PRIVACY;
 
         pr_info("vwifi: %s performs scan, found %s (SSID: %s, BSSID: %pM)\n",
@@ -586,7 +586,7 @@ static void ah_inform_bss(struct vwifi_vif *vif)
         /* It is possible to use cfg80211_inform_bss() instead. */
         bss = cfg80211_inform_bss_data(
             vif->wdev.wiphy, &data, CFG80211_BSS_FTYPE_UNKNOWN, ibss->bssid,
-            tsf, capability, ibss->ah_beacon_int, ibss->beacon_ie,
+            tsf, capability, ibss->ibss_beacon_int, ibss->beacon_ie,
             ibss->beacon_ie_len, GFP_KERNEL);
 
         /* cfg80211_inform_bss_data() returns cfg80211_bss structure reference
@@ -949,7 +949,7 @@ static netdev_tx_t vwifi_ndo_start_xmit(struct sk_buff *skb,
             }
         }
     }
-    /* TX by interface of AD-HOC mode */
+    /* TX by interface of IBSS(ad-hoc) mode */
     else if (vif->wdev.iftype == NL80211_IFTYPE_ADHOC) {
         /* Check if the packet is broadcasting */
         if (is_broadcast_ether_addr(eth_hdr->h_dest)) {
@@ -1028,7 +1028,7 @@ static void vwifi_scan_timeout_work(struct work_struct *w)
 
     /* inform with dummy BSS */
     inform_bss(vif);
-    ah_inform_bss(vif);
+    ibss_inform_bss(vif);
 
     if (mutex_lock_interruptible(&vif->lock))
         return;
@@ -1575,7 +1575,7 @@ static int vwifi_change_iface(struct wiphy *wiphy,
         ndev->ieee80211_ptr->iftype = type;
         break;
     case NL80211_IFTYPE_ADHOC:
-        pr_info("vwifi: %s start acting in AD-HOC mode.\n", ndev->name);
+        pr_info("vwifi: %s start acting in IBSS mode.\n", ndev->name);
         ndev->ieee80211_ptr->iftype = type;
         break;
     default:
@@ -2067,22 +2067,22 @@ static int vwifi_join_ibss(struct wiphy *wiphy,
     /* Retrieve IBSS configuration parameters */
     memcpy(vif->ssid, params->ssid, params->ssid_len);
     memcpy(vif->bssid, params->bssid, ETH_ALEN);
-    vif->ah_chandef = params->chandef;
+    vif->ibss_chandef = params->chandef;
     vif->ssid_len = params->ssid_len;
     vif->beacon_ie_len = params->ie_len;
     memcpy(vif->beacon_ie, params->ie, params->ie_len);
-    vif->ah_beacon_int = params->beacon_interval;
-    vif->ah_basic_rates = params->basic_rates;
-    vif->ah_channel_fixed = params->channel_fixed;
-    vif->ah_privacy = params->privacy;
-    vif->ah_control_port = params->control_port;
-    vif->ah_control_port_over_nl80211 = params->control_port_over_nl80211;
-    vif->ah_userspace_handles_dfs = params->userspace_handles_dfs;
-    memcpy(vif->ah_mcast_rate, params->mcast_rate, sizeof(params->mcast_rate));
-    vif->ah_ht_capa = params->ht_capa;
-    vif->ah_ht_capa_mask = params->ht_capa_mask;
-    vif->ah_wep_keys = params->wep_keys;
-    vif->ah_wep_tx_key = params->wep_tx_key;
+    vif->ibss_beacon_int = params->beacon_interval;
+    vif->ibss_basic_rates = params->basic_rates;
+    vif->ibss_channel_fixed = params->channel_fixed;
+    vif->ibss_privacy = params->privacy;
+    vif->ibss_control_port = params->control_port;
+    vif->ibss_control_port_over_nl80211 = params->control_port_over_nl80211;
+    vif->ibss_userspace_handles_dfs = params->userspace_handles_dfs;
+    memcpy(vif->ibss_mcast_rate, params->mcast_rate, sizeof(params->mcast_rate));
+    vif->ibss_ht_capa = params->ht_capa;
+    vif->ibss_ht_capa_mask = params->ht_capa_mask;
+    vif->ibss_wep_keys = params->wep_keys;
+    vif->ibss_wep_tx_key = params->wep_tx_key;
 
     mutex_unlock(&vif->lock);