Skip to contentSkip to conversation

test

PATCH Pranith Kumar 1 participant 1 message Jun 5, 2009 Staging

lore
Share & tools
lore
#0 lore raw
drivers/staging/otus/ioctl.c +3 -4
index ce04218..5e8bd94 100644
@@ -2045,6 +2045,7 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
   struct zsKeyInfo keyInfo;
   struct usbdrv_private *macp = dev->ml_priv;
   u16_t vapId = 0;
+    int ii;
 
   /* zmw_get_wlan_dev(dev); */
 
@@ -2168,7 +2169,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
       /* DUMP key context */
       /* #ifdef WPA_DEBUG */
       if (keyInfo.keyLength > 0) {
-            int ii;
           printk(KERN_WARNING
                       "Otus: Key Context:\n");
           for (ii = 0; ii < keyInfo.keyLength; ) {
@@ -2266,7 +2266,6 @@ int usbdrv_wpa_ioctl(struct net_device *dev, struct athr_wlan_param *zdparm)
       /* zfiWlanSetWpaIe(dev, zdparm->u.generic_elem.data,
       * zdparm->u.generic_elem.len);
       */
-        int ii;
       u8_t len = zdparm->u.generic_elem.len;
       u8_t *wpaie = (u8_t *)zdparm->u.generic_elem.data;
 
@@ -2401,7 +2400,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
   struct athr_wlan_param zdparm;
   struct usbdrv_private *macp = dev->ml_priv;
 
-    int err = 0;
+    int err = 0, val = 0;
   int changed = 0;
 
   /* regp = macp->regp; */
@@ -2445,7 +2444,7 @@ int usbdrv_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
           err = -EPERM;
           break;
       }
-        int val = *((int *) wrq->u.name);
+       val = *((int *) wrq->u.name);
       if ((val < 0) || (val > 2)) {
           err = -EINVAL;
           break;
drivers/staging/rt2860/common/ba_action.c +0 -0
index 591d1e2..befd8bd 100644
@@ -1512,7 +1512,7 @@ void convert_reordering_packet_to_preAMSDU_or_802_3_packet(
   RTPKT_TO_OSPKT(pRxPkt)->dev = get_netdev_from_bssid(pAd, 

FromWhichBSSID);
RTPKT_TO_OSPKT(pRxPkt)->data = pRxBlk->pData; RTPKT_TO_OSPKT(pRxPkt)->len = pRxBlk->DataSize;
- RTPKT_TO_OSPKT(pRxPkt)->tail = RTPKT_TO_OSPKT(pRxPkt)->data + RTPKT_TO_OSPKT(pRxPkt)->len;
+ RTPKT_TO_OSPKT(pRxPkt)->tail = (UCHAR *) (RTPKT_TO_OSPKT(pRxPkt)->data + RTPKT_TO_OSPKT(pRxPkt)->len);

//
// copy 802.3 header, if necessary

drivers/staging/rt2860/rt_linux.c +2 -2
index f3c128c..36ffb97 100644
@@ -607,7 +607,7 @@ PNDIS_PACKET ClonePacket(
       pClonedPkt->dev = pRxPkt->dev;
       pClonedPkt->data = pData;
       pClonedPkt->len = DataSize;
-        pClonedPkt->tail = pClonedPkt->data + pClonedPkt->len;
+       pClonedPkt->tail = (UCHAR *) (pClonedPkt->data + pClonedPkt->len);
       ASSERT(DataSize < 1530);
   }
   return pClonedPkt;
@@ -629,7 +629,7 @@ void  update_os_packet_info(
   pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID);
   pOSPkt->data = pRxBlk->pData;
   pOSPkt->len = pRxBlk->DataSize;
-    pOSPkt->tail = pOSPkt->data + pOSPkt->len;
+    pOSPkt->tail = (UCHAR *) (pOSPkt->data + pOSPkt->len);

}

@@ -649,7 +649,7 @@ void wlan_802_11_to_802_3_packet(
pOSPkt->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); pOSPkt->data = pRxBlk->pData;
pOSPkt->len = pRxBlk->DataSize;
- pOSPkt->tail = pOSPkt->data + pOSPkt->len;
+ pOSPkt->tail = (UCHAR *) (pOSPkt->data + pOSPkt->len);

//
// copy 802.3 header

drivers/staging/slicoss/slicoss.c +1 -1
index 6f5d0bf..43bdd9d 100644
@@ -1872,7 +1872,7 @@ static int slic_card_download(struct adapter *adapter)
   __iomem struct slic_regs *slic_regs = adapter->slic_regs;
   u32 instruction;
   u32 baseaddress;
-    u32 failure;
+    /* u32 failure; */
   u32 i;
   u32 numsects = 0;
   u32 sectsize[3];
drivers/staging/sxg/sxg.c +0 -0
index 076b3f7..30bbf76 100644
@@ -2150,7 +2150,7 @@ void sxg_set_interrupt_aggregation(struct adapter_t *adapter)

static int sxg_entry_open(struct net_device *dev)
{
struct adapter_t *adapter = (struct adapter_t *) netdev_priv(dev);
- int status;
+ int status = STATUS_FAILURE;
static int turn;
int sxg_initial_rcv_data_buffers = SXG_INITIAL_RCV_DATA_BUFFERS; int i;