Commit ae9f66da authored by Mike McCormack's avatar Mike McCormack Committed by Greg Kroah-Hartman

staging: rtl8192e: Remove struct member irq_mask

Signed-off-by: default avatarMike McCormack <mikem@ring3k.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 703fdcc3
...@@ -810,7 +810,6 @@ typedef struct r8192_priv ...@@ -810,7 +810,6 @@ typedef struct r8192_priv
struct mutex mutex; struct mutex mutex;
spinlock_t ps_lock; spinlock_t ps_lock;
u32 irq_mask;
short chan; short chan;
short sens; short sens;
/* RX stuff */ /* RX stuff */
......
...@@ -617,7 +617,14 @@ static void tx_timeout(struct net_device *dev) ...@@ -617,7 +617,14 @@ static void tx_timeout(struct net_device *dev)
static void rtl8192_irq_enable(struct net_device *dev) static void rtl8192_irq_enable(struct net_device *dev)
{ {
struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev); struct r8192_priv *priv = (struct r8192_priv *)ieee80211_priv(dev);
write_nic_dword(priv, INTA_MASK, priv->irq_mask); u32 mask;
mask = IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |
IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |
IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER;
write_nic_dword(priv, INTA_MASK, mask);
} }
static void rtl8192_irq_disable(struct net_device *dev) static void rtl8192_irq_disable(struct net_device *dev)
...@@ -2042,11 +2049,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev) ...@@ -2042,11 +2049,6 @@ static void rtl8192_init_priv_variable(struct net_device* dev)
RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) | RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) |
((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT; ((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT;
priv->irq_mask = (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |
IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW |
IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
priv->pFirmware = vzalloc(sizeof(rt_firmware)); priv->pFirmware = vzalloc(sizeof(rt_firmware));
/* rx related queue */ /* rx related queue */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment