Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rtl8192u / r8192U_core.c

diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c
index 494f180acc262df898a1c708c102e1a214df69b5..ae4f2b9d9e8f6df0d211c74ea2556fd76f56ed1d 100644 (file)
--- a/drivers/staging/rtl8192u/r8192U_core.c
+++ b/drivers/staging/rtl8192u/r8192U_core.c
@@ -77,9 +77,7 @@ double __extendsfdf2(float a) {return a;}
 #include "r8192_pm.h"
 #endif
 
-#ifdef ENABLE_DOT11D
 #include "dot11d.h"
-#endif
 //set here to open your trace code. //WB
 u32 rt_global_debug_component = \
                        //      COMP_INIT       |
@@ -166,7 +164,6 @@ static struct usb_driver rtl8192_usb_driver = {
 #endif
 };
 
-#ifdef ENABLE_DOT11D
 
 typedef struct _CHANNEL_LIST
 {
@@ -242,9 +239,7 @@ static void rtl819x_set_channel_map(u8 channel_plan, struct r8192_priv* priv)
        }
        return;
 }
-#endif
 
-#define eqMacAddr(a,b) ( ((a)[0]==(b)[0] && (a)[1]==(b)[1] && (a)[2]==(b)[2] && (a)[3]==(b)[3] && (a)[4]==(b)[4] && (a)[5]==(b)[5]) ? 1:0 )
 
 #define        rx_hal_is_cck_rate(_pdrvinfo)\
                        (_pdrvinfo->RxRate == DESC90_RATE1M ||\
@@ -1507,7 +1502,7 @@ static void rtl8192_tx_isr(struct urb *tx_urb)
        {
                //
                // Handle HW Beacon:
-               // We had transfer our beacon frame to host controler at this moment.
+               // We had transfer our beacon frame to host controller at this moment.
                //
                //
                // Caution:
@@ -2203,6 +2198,8 @@ short rtl8192_usb_initendpoints(struct net_device *dev)
 
        priv->rx_urb = kmalloc(sizeof(struct urb *) * (MAX_RX_URB+1),
                                GFP_KERNEL);
+       if (priv->rx_urb == NULL)
+               return -ENOMEM;
 
 #ifndef JACKSON_NEW_RX
        for(i=0;i<(MAX_RX_URB+1);i++){
@@ -3155,7 +3152,6 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
 short rtl8192_get_channel_map(struct net_device * dev)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
-#ifdef ENABLE_DOT11D
        if(priv->ChannelPlan > COUNTRY_CODE_GLOBAL_DOMAIN){
                printk("rtl8180_init:Error channel plan! Set to default.\n");
                priv->ChannelPlan= 0;
@@ -3163,21 +3159,6 @@ short rtl8192_get_channel_map(struct net_device * dev)
        RT_TRACE(COMP_INIT, "Channel plan is %d\n",priv->ChannelPlan);
 
        rtl819x_set_channel_map(priv->ChannelPlan, priv);
-#else
-       int ch,i;
-       //Set Default Channel Plan
-       if(!channels){
-               DMESG("No channels, aborting");
-               return -1;
-       }
-       ch=channels;
-       priv->ChannelPlan= 0;//hikaru
-        // set channels 1..14 allowed in given locale
-       for (i=1; i<=14; i++) {
-               (priv->ieee80211->channel_map)[i] = (u8)(ch & 0x01);
-               ch >>= 1;
-       }
-#endif
        return 0;
 }
 
@@ -5085,7 +5066,7 @@ static void rtl8192_query_rxphystatus(
                        //Get Rx snr value in DB
                        tmp_rxsnr =     pofdm_buf->rxsnr_X[i];
                        rx_snrX = (char)(tmp_rxsnr);
-                       //rx_snrX >>= 1;;
+                       //rx_snrX >>= 1;
                        rx_snrX /= 2;
                        priv->stats.rxSNRdB[i] = (long)rx_snrX;