OSDN Git Service

rsi: Move variable initialisation into error code
authorMarkus Elfring <elfring@users.sourceforge.net>
Fri, 18 Mar 2016 02:27:31 +0000 (13:27 +1100)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 7 Apr 2016 16:37:48 +0000 (19:37 +0300)
In rsi_send_data_pkt(), it's a little more logical to assign 'status' in
the actual error handling code as opposed to at the top of the functon.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
[Deleted controversial bits, rewrote commit message]
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/rsi/rsi_91x_pkt.c

index 4322df1..a0b31c0 100644 (file)
@@ -31,7 +31,7 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb)
        struct ieee80211_tx_info *info;
        struct skb_info *tx_params;
        struct ieee80211_bss_conf *bss;
-       int status = -EINVAL;
+       int status;
        u8 ieee80211_size = MIN_802_11_HDR_LEN;
        u8 extnd_size;
        __le16 *frame_desc;
@@ -41,8 +41,10 @@ int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb)
        bss = &info->control.vif->bss_conf;
        tx_params = (struct skb_info *)info->driver_data;
 
-       if (!bss->assoc)
+       if (!bss->assoc) {
+               status = -EINVAL;
                goto err;
+       }
 
        tmp_hdr = (struct ieee80211_hdr *)&skb->data[0];
        seq_num = (le16_to_cpu(tmp_hdr->seq_ctrl) >> 4);