[PATCH] Rename request structures to make them distinct from functions

at76_start_scan was both a function and a structure.  Use "req" in the
structure names to indicate that they are requests.

Signed-off-by: Pavel Roskin <proski@gnu.org>

2 files changed, 11 insertions, 11 deletions

diff --git a/at76_usb.c b/at76_usb.c
index 8a13e1e..758a2b8 100644
--- a/at76_usb.c
+++ b/at76_usb.c
@@ -1476,9 +1476,9 @@ static int at76_get_current_channel(struct at76_priv *priv)
  */
 static int at76_start_scan(struct at76_priv *priv, int use_essid, int ir_step)
 {
-	struct at76_start_scan scan;
+	struct at76_req_scan scan;
 
-	memset(&scan, 0, sizeof(struct at76_start_scan));
+	memset(&scan, 0, sizeof(struct at76_req_scan));
 	memset(scan.bssid, 0xff, ETH_ALEN);
 
 	if (use_essid) {
@@ -1533,9 +1533,9 @@ static int at76_start_scan(struct at76_priv *priv, int use_essid, int ir_step)
 
 static int at76_start_ibss(struct at76_priv *priv)
 {
-	struct at76_start_bss bss;
+	struct at76_req_ibss bss;
 
-	memset(&bss, 0, sizeof(struct at76_start_bss));
+	memset(&bss, 0, sizeof(struct at76_req_ibss));
 	memset(bss.bssid, 0xff, ETH_ALEN);
 	memcpy(bss.essid, priv->essid, IW_ESSID_MAX_SIZE);
 	bss.essid_size = priv->essid_size;
@@ -1543,18 +1543,18 @@ static int at76_start_ibss(struct at76_priv *priv)
 	bss.channel = priv->channel;
 
 	return at76_set_card_command(priv->udev, CMD_START_IBSS, &bss,
-				     sizeof(struct at76_start_bss));
+				     sizeof(struct at76_req_ibss));
 }
 
 
 /* idx points into priv->bss */
 static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr)
 {
-	struct at76_join join;
+	struct at76_req_join join;
 
 	at76_assert(ptr != NULL);
 
-	memset(&join, 0, sizeof(struct at76_join));
+	memset(&join, 0, sizeof(struct at76_req_join));
 	memcpy(join.bssid, ptr->bssid, ETH_ALEN);
 	memcpy(join.essid, ptr->ssid, ptr->ssid_len);
 	join.essid_size = ptr->ssid_len;
@@ -1566,7 +1566,7 @@ static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr)
 	         priv->netdev->name, mac2str(join.bssid),
 	         join.essid, join.bss_type, join.channel, le16_to_cpu(join.timeout));
 	return at76_set_card_command(priv->udev, CMD_JOIN, &join,
-				     sizeof(struct at76_join));
+				     sizeof(struct at76_req_join));
 }
 
 
diff --git a/at76_usb.h b/at76_usb.h
index 7fd61f5..428a562 100644
--- a/at76_usb.h
+++ b/at76_usb.h
@@ -222,7 +222,7 @@ struct at76_tx_buffer {
 #define SCAN_TYPE_ACTIVE  0
 #define SCAN_TYPE_PASSIVE 1
 
-struct at76_start_scan {
+struct at76_req_scan {
 	u8 bssid[ETH_ALEN];
 	u8 essid[32];
 	u8 scan_type;
@@ -234,7 +234,7 @@ struct at76_start_scan {
 	u8 international_scan;
 } __attribute__ ((packed));
 
-struct at76_start_bss {
+struct at76_req_ibss {
 	u8 bssid[ETH_ALEN];
 	u8 essid[32];
 	u8 bss_type;
@@ -243,7 +243,7 @@ struct at76_start_bss {
 	u8 reserved[3];
 } __attribute__ ((packed));
 
-struct at76_join {
+struct at76_req_join {
 	u8 bssid[ETH_ALEN];
 	u8 essid[32];
 	u8 bss_type;