Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (48 commits)
  [PATCH] bonding: update version number
  [PATCH] git-netdev-all: pc300_tty build fix
  [PATCH] Make PC300 WAN driver compile again
  [PATCH] Modularize generic HDLC
  [PATCH] more s2io __iomem annotations
  [PATCH] restore __iomem annotations in e1000
  [PATCH] 64bit bugs in s2io
  [PATCH] bonding: Fix primary selection error at enslavement time
  [PATCH] bonding: Don't mangle LACPDUs
  [PATCH] bonding: Validate probe replies in ARP monitor
  [PATCH] bonding: Don't release slaves when master is admin down
  [PATCH] bonding: Add priv_flag to avoid event mishandling
  [PATCH] bonding: Handle large hard_header_len
  [PATCH] bonding: Remove unneeded NULL test
  [PATCH] bonding: Format fix in seq_printf call
  [PATCH] bonding: Convert delay value from s16 to int
  [PATCH] bonding: Allow bonding to enslave a 10 Gig adapter
  Delete unused drivers/net/gt64240eth.h
  [PATCH] skge: fiber support
  [PATCH] fix possible NULL ptr deref in forcedeth
  ...

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 995c7bea5897..0fc267d626dc 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1656,13 +1656,13 @@ static int atmel_set_essid(struct net_device *dev,
                 priv->connect_to_any_BSS = 0;
 
                 /* Check the size of the string */
-                if (dwrq->length > MAX_SSID_LENGTH + 1)
+                if (dwrq->length > MAX_SSID_LENGTH)
                          return -E2BIG;
                 if (index != 0)
                         return -EINVAL;
 
-                memcpy(priv->new_SSID, extra, dwrq->length - 1);
-                priv->new_SSID_size = dwrq->length - 1;
+                memcpy(priv->new_SSID, extra, dwrq->length);
+                priv->new_SSID_size = dwrq->length;
         }
 
         return -EINPROGRESS;
@@ -2120,9 +2120,9 @@ static int atmel_set_retry(struct net_device *dev,
         struct atmel_private *priv = netdev_priv(dev);
 
         if (!vwrq->disabled && (vwrq->flags & IW_RETRY_LIMIT)) {
-                if (vwrq->flags & IW_RETRY_MAX)
+                if (vwrq->flags & IW_RETRY_LONG)
                         priv->long_retry = vwrq->value;
-                else if (vwrq->flags & IW_RETRY_MIN)
+                else if (vwrq->flags & IW_RETRY_SHORT)
                         priv->short_retry = vwrq->value;
                 else {
                         /* No modifier : set both */
@@ -2144,15 +2144,15 @@ static int atmel_get_retry(struct net_device *dev,
 
         vwrq->disabled = 0;      /* Can't be disabled */
 
-        /* Note : by default, display the min retry number */
-        if (vwrq->flags & IW_RETRY_MAX) {
-                vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_MAX;
+        /* Note : by default, display the short retry number */
+        if (vwrq->flags & IW_RETRY_LONG) {
+                vwrq->flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
                 vwrq->value = priv->long_retry;
         } else {
                 vwrq->flags = IW_RETRY_LIMIT;
                 vwrq->value = priv->short_retry;
                 if (priv->long_retry != priv->short_retry)
-                        vwrq->flags |= IW_RETRY_MIN;
+                        vwrq->flags |= IW_RETRY_SHORT;
         }
 
         return 0;