diff options
Diffstat (limited to 'drivers/staging/rt3070/rt_main_dev.c')
| -rw-r--r-- | drivers/staging/rt3070/rt_main_dev.c | 56 |
1 files changed, 1 insertions, 55 deletions
diff --git a/drivers/staging/rt3070/rt_main_dev.c b/drivers/staging/rt3070/rt_main_dev.c index bce9708b713f..33e3c5b72ef1 100644 --- a/drivers/staging/rt3070/rt_main_dev.c +++ b/drivers/staging/rt3070/rt_main_dev.c @@ -46,7 +46,7 @@ //static RALINK_TIMER_STRUCT PeriodicTimer; char *mac = ""; // default 00:00:00:00:00:00 -char *hostname = ""; // default CMPC +char *hostname = ""; module_param (mac, charp, 0); MODULE_PARM_DESC (mac, "rt28xx: wireless mac addr"); @@ -68,7 +68,6 @@ static int rt28xx_init(IN struct net_device *net_dev); INT rt28xx_send_packets(IN struct sk_buff *skb_p, IN struct net_device *net_dev); static void CfgInitHook(PRTMP_ADAPTER pAd); -//static BOOLEAN RT28XXAvailRANameAssign(IN CHAR *name_p); extern const struct iw_handler_def rt28xx_iw_handler_def; @@ -288,9 +287,6 @@ int rt28xx_close(IN PNET_DEV dev) remove_wait_queue (&unlink_wakeup, &wait); #endif // RT2870 // - //RTUSBCleanUpMLMEWaitQueue(pAd); /*not used in RT28xx*/ - - #ifdef RT2870 // We need clear timerQ related structure before exits of the timer thread. RT2870_TimerQ_Exit(pAd); @@ -331,10 +327,7 @@ static int rt28xx_init(IN struct net_device *net_dev) PRTMP_ADAPTER pAd = net_dev->ml_priv; UINT index; UCHAR TmpPhy; -// ULONG Value=0; NDIS_STATUS Status; -// OID_SET_HT_PHYMODE SetHT; -// WPDMA_GLO_CFG_STRUC GloCfg; UINT32 MacCsr0 = 0; // Allocate BA Reordering memory @@ -405,9 +398,6 @@ static int rt28xx_init(IN struct net_device *net_dev) if (Status != NDIS_STATUS_SUCCESS) goto err1; -// COPY_MAC_ADDR(pAd->ApCfg.MBSSID[apidx].Bssid, netif->hwaddr); -// pAd->bForcePrintTX = TRUE; - CfgInitHook(pAd); NdisAllocateSpinLock(&pAd->MacTabLock); @@ -457,13 +447,6 @@ static int rt28xx_init(IN struct net_device *net_dev) pAd->CommonCfg.HtCapability.HtCapInfo.AMsduSize = (USHORT)pAd->CommonCfg.BACapability.field.AmsduSize; pAd->CommonCfg.HtCapability.HtCapParm.MpduDensity = (UCHAR)pAd->CommonCfg.BACapability.field.MpduDensity; - // after reading Registry, we now know if in AP mode or STA mode - - // Load 8051 firmware; crash when FW image not existent - // Status = NICLoadFirmware(pAd); - // if (Status != NDIS_STATUS_SUCCESS) - // break; - printk("2. Phy Mode = %d\n", pAd->CommonCfg.PhyMode); // We should read EEPROM for all cases. rt2860b @@ -495,8 +478,6 @@ static int rt28xx_init(IN struct net_device *net_dev) NICInitRT30xxRFRegisters(pAd); #endif // RT30xx // -// APInitialize(pAd); - #ifdef IKANOS_VX_1X0 VR_IKANOS_FP_Init(pAd->ApCfg.BssidNum, pAd->PermanentAddress); #endif // IKANOS_VX_1X0 // @@ -514,16 +495,13 @@ static int rt28xx_init(IN struct net_device *net_dev) // if (RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE)) { -// NdisMDeregisterInterrupt(&pAd->Interrupt); RTMP_CLEAR_FLAG(pAd, fRTMP_ADAPTER_INTERRUPT_IN_USE); } -// RTMPFreeAdapter(pAd); // we will free it in disconnect() } else if (pAd) { // Microsoft HCT require driver send a disconnect event after driver initialization. OPSTATUS_CLEAR_FLAG(pAd, fOP_STATUS_MEDIA_STATE_CONNECTED); -// pAd->IndicateMediaState = NdisMediaStateDisconnected; RTMP_SET_FLAG(pAd, fRTMP_ADAPTER_MEDIA_STATE_CHANGE); DBGPRINT(RT_DEBUG_TRACE, ("NDIS_STATUS_MEDIA_DISCONNECT Event B!\n")); @@ -556,7 +534,6 @@ err3: MlmeHalt(pAd); err2: RTMPFreeTxRxRingMemory(pAd); -// RTMPFreeAdapter(pAd); err1: os_free_mem(pAd, pAd->mpdu_blk_pool.mem); // free BA pool RT28XX_IRQ_RELEASE(net_dev); @@ -644,19 +621,6 @@ int rt28xx_open(IN PNET_DEV dev) printk("0x1300 = %08x\n", reg); } - { -// u32 reg; -// u8 byte; -// u16 tmp; - -// RTMP_IO_READ32(pAd, XIFS_TIME_CFG, ®); - -// tmp = 0x0805; -// reg = (reg & 0xffff0000) | tmp; -// RTMP_IO_WRITE32(pAd, XIFS_TIME_CFG, reg); - - } - return (retval); err: @@ -686,10 +650,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p CHAR slot_name[IFNAMSIZ]; struct net_device *device; - - //ether_setup(dev); -// dev->set_multicast_list = ieee80211_set_multicast_list; -// dev->change_mtu = ieee80211_change_mtu; #if WIRELESS_EXT >= 12 if (pAd->OpMode == OPMODE_STA) { @@ -700,8 +660,6 @@ static NDIS_STATUS rt_ieee80211_if_setup(struct net_device *dev, PRTMP_ADAPTER p #if WIRELESS_EXT < 21 dev->get_wireless_stats = rt28xx_get_wireless_stats; #endif -// dev->uninit = ieee80211_if_reinit; -// dev->destructor = ieee80211_if_free; dev->priv_flags = INT_MAIN; dev->netdev_ops = &rt3070_netdev_ops; // find available device name @@ -768,10 +726,6 @@ INT __devinit rt28xx_probe( DBGPRINT(RT_DEBUG_TRACE, ("STA Driver version-%s\n", STA_DRIVER_VERSION)); - // Check chipset vendor/product ID -// if (RT28XXChipsetCheck(_dev_p) == FALSE) -// goto err_out; - net_dev = alloc_etherdev(sizeof(PRTMP_ADAPTER)); if (net_dev == NULL) { @@ -780,10 +734,6 @@ INT __devinit rt28xx_probe( goto err_out; } -// sample -// if (rt_ieee80211_if_setup(net_dev) != NDIS_STATUS_SUCCESS) -// goto err_out; - netif_stop_queue(net_dev); /* for supporting Network Manager */ @@ -807,9 +757,6 @@ INT __devinit rt28xx_probe( pAd->StaCfg.OriDevType = net_dev->type; - // Find and assign a free interface name, raxx -// RT28XXAvailRANameAssign(net_dev->name); - // Post config if (RT28XXProbePostConfig(_dev_p, pAd, 0) == FALSE) goto err_out_unmap; @@ -892,7 +839,6 @@ int rt28xx_packet_xmit(struct sk_buff *skb) } RTMP_SET_PACKET_5VT(pPacket, 0); -// MiniportMMRequest(pAd, pkt->data, pkt->len); #ifdef CONFIG_5VT_ENHANCE if (*(int*)(skb->cb) == BRIDGE_TAG) { RTMP_SET_PACKET_5VT(pPacket, 1); |