staging: ks7010: remove bogus NULL checks

[deliverable/linux.git] / drivers / staging / ks7010 / ks_wlan_net.c

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index 26dbb75da8262fb344e3b80196e39f5a31876979..1e21eb1c46675721c19e4f4a6a06cf64fc393458 100644 (file)
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -1910,11 +1910,8 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
                        priv->wpa.txkey = index;
                        commit |= SME_WEP_INDEX;
                } else if (enc->ext_flags & IW_ENCODE_EXT_RX_SEQ_VALID) {
-                       if (enc->rx_seq)
-                               memcpy(&priv->wpa.key[index].rx_seq[0],
-                                      enc->rx_seq, IW_ENCODE_SEQ_MAX_SIZE);
-                       else
-                               return -EINVAL;
+                       memcpy(&priv->wpa.key[index].rx_seq[0],
+                              enc->rx_seq, IW_ENCODE_SEQ_MAX_SIZE);
                }
 
                memcpy(&priv->wpa.key[index].addr.sa_data[0],
@@ -1935,7 +1932,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
                                priv->reg.privacy_invoked = 0x01;
                                commit |= SME_WEP_FLAG;
                        }
-                       if (enc->key && enc->key_len) {
+                       if (enc->key_len) {
                                memcpy(&priv->wpa.key[index].key_val[0],
                                       &enc->key[0], enc->key_len);
                                priv->wpa.key[index].key_len = enc->key_len;
@@ -1947,7 +1944,7 @@ static int ks_wlan_set_encode_ext(struct net_device *dev,
                                priv->reg.privacy_invoked = 0x01;
                                commit |= SME_WEP_FLAG;
                        }
-                       if (enc->key && enc->key_len == 32) {
+                       if (enc->key_len == 32) {
                                memcpy(&priv->wpa.key[index].key_val[0],
                                       &enc->key[0], enc->key_len - 16);
                                priv->wpa.key[index].key_len =