Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 559fba5e authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Make functions static 



Move some function prototypes to the top of the file
and make some functions static.

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4a533365

drivers/staging/rtl8192e/r8192E.h

+0 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,6 @@ void write_phy_ofdm(struct net_device *dev, u8 adr, u32 data); 
void rtl8185_tx_antenna(struct net_device *dev, u8 ant);

void rtl8187_set_rxconf(struct net_device *dev);

//short check_nic_enough_desc(struct net_device *dev, priority_t priority);

void rtl8192_start_beacon(struct net_device *dev);

void CamResetAllEntry(struct net_device* dev);

void EnableHWSecurityConfig8192(struct net_device *dev);

void setKey(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, u8 *MacAddr, u8 DefaultKey, u32 *KeyContent );

drivers/staging/rtl8192e/r8192E_core.c

+17 −17
Original line number Diff line number Diff line
@@ -155,6 +155,15 @@ static struct pci_driver rtl8192_pci_driver = { 
#endif

};



static void rtl8192_start_beacon(struct net_device *dev);

static void rtl8192_stop_beacon(struct net_device *dev);

static void rtl819x_watchdog_wqcallback(struct work_struct *work);

static void rtl8192_irq_rx_tasklet(struct r8192_priv *priv);

static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv);

static void rtl8192_prepare_beacon(struct r8192_priv *priv);

static irqreturn_t rtl8192_interrupt(int irq, void *netdev);

static void rtl8192_try_wake_queue(struct net_device *dev, int pri);



#ifdef ENABLE_DOT11D



typedef struct _CHANNEL_LIST
@@ -487,15 +496,13 @@ rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val) 
/* this might still called in what was the PHY rtl8185/rtl8192 common code

 * plans are to possibilty turn it again in one common code...

 */

inline void force_pci_posting(struct net_device *dev)

void force_pci_posting(struct net_device *dev)

{

}





//warning message WB

irqreturn_t rtl8192_interrupt(int irq, void *netdev);

//static struct net_device_stats *rtl8192_stats(struct net_device *dev);

void rtl8192_commit(struct net_device *dev);

//void rtl8192_restart(struct net_device *dev);

void rtl8192_restart(struct work_struct *work);

//void rtl8192_rq_tx_ack(struct work_struct *work);
@@ -1252,8 +1259,6 @@ static int rtl8192_hard_start_xmit(struct sk_buff *skb,struct net_device *dev) 
}





void rtl8192_try_wake_queue(struct net_device *dev, int pri);



static void rtl8192_tx_isr(struct net_device *dev, int prio)

{

    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
@@ -2646,11 +2651,6 @@ static void rtl8192_init_priv_lock(struct r8192_priv* priv) 
	mutex_init(&priv->mutex);

}



extern  void    rtl819x_watchdog_wqcallback(struct work_struct *work);



void rtl8192_irq_rx_tasklet(struct r8192_priv *priv);

void rtl8192_irq_tx_tasklet(struct r8192_priv *priv);

void rtl8192_prepare_beacon(struct r8192_priv *priv);

//init tasklet and wait_queue here. only 2.6 above kernel is considered

#define DRV_NAME "wlan0"

static void rtl8192_init_priv_task(struct net_device* dev)
@@ -3807,7 +3807,7 @@ static RT_STATUS rtl8192_adapter_start(struct net_device *dev) 


}



void rtl8192_prepare_beacon(struct r8192_priv *priv)

static void rtl8192_prepare_beacon(struct r8192_priv *priv)

{

	struct sk_buff *skb;

	//unsigned long flags;
@@ -3837,7 +3837,7 @@ void rtl8192_prepare_beacon(struct r8192_priv *priv) 
 * rtl8192_beacon_tx_enable(). rtl8192_beacon_tx_disable() might

 * be used to stop beacon transmission

 */

void rtl8192_start_beacon(struct net_device *dev)

static void rtl8192_start_beacon(struct net_device *dev)

{

	struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);

	struct ieee80211_network *net = &priv->ieee80211->current_network;
@@ -4668,7 +4668,7 @@ static void rtl819x_update_rxcounts( 
}





void rtl819x_watchdog_wqcallback(struct work_struct *work)

static void rtl819x_watchdog_wqcallback(struct work_struct *work)

{

	struct delayed_work *dwork = container_of(work,struct delayed_work,work);

       struct r8192_priv *priv = container_of(dwork,struct r8192_priv,watch_dog_wq);
@@ -6075,7 +6075,7 @@ static void rtl8192_tx_resume(struct net_device *dev) 
	}

}



void rtl8192_irq_tx_tasklet(struct r8192_priv *priv)

static void rtl8192_irq_tx_tasklet(struct r8192_priv *priv)

{

       rtl8192_tx_resume(priv->ieee80211->dev);

}
@@ -6304,7 +6304,7 @@ done: 


}



void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)

static void rtl8192_irq_rx_tasklet(struct r8192_priv *priv)

{

       rtl8192_rx(priv->ieee80211->dev);

	/* unmask RDU */
@@ -6639,7 +6639,7 @@ static void __exit rtl8192_pci_module_exit(void) 
}



//warning message WB

irqreturn_t rtl8192_interrupt(int irq, void *netdev)

static irqreturn_t rtl8192_interrupt(int irq, void *netdev)

{

    struct net_device *dev = (struct net_device *) netdev;

    struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
@@ -6783,7 +6783,7 @@ irqreturn_t rtl8192_interrupt(int irq, void *netdev) 
    return IRQ_HANDLED;

}



void rtl8192_try_wake_queue(struct net_device *dev, int pri)

static void rtl8192_try_wake_queue(struct net_device *dev, int pri)

{

#if 0

	unsigned long flags;