Commit 82bb18e1 authored by Glen Lee's avatar Glen Lee Committed by Greg Kroah-Hartman

staging: wilc1000: tcp_process: add argument dev and use private data

This patch adds new argument net_device and use netdev private data member
wilc instead of g_linux_wlan. Pass argument dev to the function as well.
Signed-off-by: default avatarGlen Lee <glen.lee@atmel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 691bbd42
...@@ -341,7 +341,7 @@ static inline int remove_TCP_related(void) ...@@ -341,7 +341,7 @@ static inline int remove_TCP_related(void)
return 0; return 0;
} }
static inline int tcp_process(struct txq_entry_t *tqe) static inline int tcp_process(struct net_device *dev, struct txq_entry_t *tqe)
{ {
int ret; int ret;
u8 *eth_hdr_ptr; u8 *eth_hdr_ptr;
...@@ -350,8 +350,13 @@ static inline int tcp_process(struct txq_entry_t *tqe) ...@@ -350,8 +350,13 @@ static inline int tcp_process(struct txq_entry_t *tqe)
int i; int i;
wilc_wlan_dev_t *p = &g_wlan; wilc_wlan_dev_t *p = &g_wlan;
unsigned long flags; unsigned long flags;
perInterface_wlan_t *nic;
struct wilc *wilc;
spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags); nic = netdev_priv(dev);
wilc = nic->wilc;
spin_lock_irqsave(&wilc->txq_spinlock, flags);
eth_hdr_ptr = &buffer[0]; eth_hdr_ptr = &buffer[0];
h_proto = ntohs(*((unsigned short *)&eth_hdr_ptr[12])); h_proto = ntohs(*((unsigned short *)&eth_hdr_ptr[12]));
...@@ -399,7 +404,7 @@ static inline int tcp_process(struct txq_entry_t *tqe) ...@@ -399,7 +404,7 @@ static inline int tcp_process(struct txq_entry_t *tqe)
} else { } else {
ret = 0; ret = 0;
} }
spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags); spin_unlock_irqrestore(&wilc->txq_spinlock, flags);
return ret; return ret;
} }
...@@ -525,7 +530,7 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer, ...@@ -525,7 +530,7 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void *priv, u8 *buffer,
#ifdef TCP_ACK_FILTER #ifdef TCP_ACK_FILTER
tqe->tcp_PendingAck_index = NOT_TCP_ACK; tqe->tcp_PendingAck_index = NOT_TCP_ACK;
if (is_TCP_ACK_Filter_Enabled()) if (is_TCP_ACK_Filter_Enabled())
tcp_process(tqe); tcp_process(dev, tqe);
#endif #endif
wilc_wlan_txq_add_to_tail(tqe); wilc_wlan_txq_add_to_tail(tqe);
/*return number of itemes in the queue*/ /*return number of itemes in the 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