cfg80211: remove enum ieee80211_band

[cascardo/linux.git] / drivers / net / wireless / rsi / rsi_91x_pkt.c

diff --git a/drivers/net/wireless/rsi/rsi_91x_pkt.c b/drivers/net/wireless/rsi/rsi_91x_pkt.c
index 702593f..02920c9 100644 (file)
--- a/drivers/net/wireless/rsi/rsi_91x_pkt.c
+++ b/drivers/net/wireless/rsi/rsi_91x_pkt.c
@@ -27,22 +27,24 @@
 int rsi_send_data_pkt(struct rsi_common *common, struct sk_buff *skb)
 {
        struct rsi_hw *adapter = common->priv;
-       struct ieee80211_hdr *tmp_hdr = NULL;
+       struct ieee80211_hdr *tmp_hdr;
        struct ieee80211_tx_info *info;
        struct skb_info *tx_params;
-       struct ieee80211_bss_conf *bss = NULL;
-       int status = -EINVAL;
+       struct ieee80211_bss_conf *bss;
+       int status;
        u8 ieee80211_size = MIN_802_11_HDR_LEN;
-       u8 extnd_size = 0;
+       u8 extnd_size;
        __le16 *frame_desc;
-       u16 seq_num = 0;
+       u16 seq_num;
 
        info = IEEE80211_SKB_CB(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);
@@ -123,15 +125,15 @@ int rsi_send_mgmt_pkt(struct rsi_common *common,
                      struct sk_buff *skb)
 {
        struct rsi_hw *adapter = common->priv;
-       struct ieee80211_hdr *wh = NULL;
+       struct ieee80211_hdr *wh;
        struct ieee80211_tx_info *info;
-       struct ieee80211_bss_conf *bss = NULL;
+       struct ieee80211_bss_conf *bss;
        struct ieee80211_hw *hw = adapter->hw;
        struct ieee80211_conf *conf = &hw->conf;
        struct skb_info *tx_params;
        int status = -E2BIG;
-       __le16 *msg = NULL;
-       u8 extnd_size = 0;
+       __le16 *msg;
+       u8 extnd_size;
        u8 vap_id = 0;
 
        info = IEEE80211_SKB_CB(skb);
@@ -182,7 +184,7 @@ int rsi_send_mgmt_pkt(struct rsi_common *common,
        if (wh->addr1[0] & BIT(0))
                msg[3] |= cpu_to_le16(RSI_BROADCAST_PKT);
 
-       if (common->band == IEEE80211_BAND_2GHZ)
+       if (common->band == NL80211_BAND_2GHZ)
                msg[4] = cpu_to_le16(RSI_11B_MODE);
        else
                msg[4] = cpu_to_le16((RSI_RATE_6 & 0x0f) | RSI_11G_MODE);