1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index 8a31b591a901..9e19a963febc 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -76,13 +76,13 @@
 
 #define DRIVER_NAME "orinoco"
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <linux/ethtool.h>
+#include <linux/if_arp.h>
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
 #include <net/ieee80211.h>
@@ -165,7 +165,7 @@ static const u8 encaps_hdr[] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00};
 #define MAX_RID_LEN 1024
 
 static const struct iw_handler_def orinoco_handler_def;
-static struct ethtool_ops orinoco_ethtool_ops;
+static const struct ethtool_ops orinoco_ethtool_ops;
 
 /********************************************************************/
 /* Data tables                                                      */
@@ -2876,7 +2876,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,
         if (orinoco_lock(priv, &flags) != 0)
                 return -EBUSY;
 
-        if (erq->pointer) {
+        if (erq->length > 0) {
                 if ((index < 0) || (index >= ORINOCO_MAX_KEYS))
                         index = priv->tx_key;
 
@@ -2919,7 +2919,7 @@ static int orinoco_ioctl_setiwencode(struct net_device *dev,
         if (erq->flags & IW_ENCODE_RESTRICTED)
                 restricted = 1;
 
-        if (erq->pointer) {
+        if (erq->pointer && erq->length > 0) {
                 priv->keys[index].len = cpu_to_le16(xlen);
                 memset(priv->keys[index].data, 0,
                        sizeof(priv->keys[index].data));
@@ -3037,7 +3037,7 @@ static int orinoco_ioctl_getessid(struct net_device *dev,
         }
 
         erq->flags = 1;
-        erq->length = strlen(essidbuf) + 1;
+        erq->length = strlen(essidbuf);
 
         return 0;
 }
@@ -3078,7 +3078,7 @@ static int orinoco_ioctl_getnick(struct net_device *dev,
         memcpy(nickbuf, priv->nick, IW_ESSID_MAX_SIZE+1);
         orinoco_unlock(priv, &flags);
 
-        nrq->length = strlen(nickbuf)+1;
+        nrq->length = strlen(nickbuf);
 
         return 0;
 }
@@ -3575,14 +3575,14 @@ static int orinoco_ioctl_getretry(struct net_device *dev,
                 rrq->value = lifetime * 1000;   /* ??? */
         } else {
                 /* By default, display the min number */
-                if ((rrq->flags & IW_RETRY_MAX)) {
-                        rrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
+                if ((rrq->flags & IW_RETRY_LONG)) {
+                        rrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
                         rrq->value = long_limit;
                 } else {
                         rrq->flags = IW_RETRY_LIMIT;
                         rrq->value = short_limit;
                         if(short_limit != long_limit)
-                                rrq->flags |= IW_RETRY_MIN;
+                                rrq->flags |= IW_RETRY_SHORT;
                 }
         }
 
@@ -4293,7 +4293,7 @@ static void orinoco_get_drvinfo(struct net_device *dev,
                          "PCMCIA %p", priv->hw.iobase);
 }
 
-static struct ethtool_ops orinoco_ethtool_ops = {
+static const struct ethtool_ops orinoco_ethtool_ops = {
         .get_drvinfo = orinoco_get_drvinfo,
         .get_link = ethtool_op_get_link,
 };