diff options
author | Gertjan van Wingerde <gwingerde@gmail.com> | 2010-06-29 15:41:40 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-30 15:00:50 -0400 |
commit | e513a0b6f1bf8e1b59b0e1382d4e7ef3d344d535 (patch) | |
tree | 6cc2ff94dd486eb4b5eb7b6d2aabc0bff4b033c5 /drivers/net/wireless/rt2x00/rt2x00pci.c | |
parent | 78eea11b0e6ae5771bc19cc46984f1cdcbbb6ba1 (diff) |
rt2x00: Move common txdone handling to rt2x00lib_txdone.
Now that the write_tx_data functions are merged, also merge the relevant
parts of the txdone handling into common code, rather than {usb,pci}
specific code.
Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00pci.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00pci.c | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 1c9ccc30b6a4..fc9da8358784 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
@@ -60,37 +60,6 @@ int rt2x00pci_regbusy_read(struct rt2x00_dev *rt2x00dev, | |||
60 | } | 60 | } |
61 | EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read); | 61 | EXPORT_SYMBOL_GPL(rt2x00pci_regbusy_read); |
62 | 62 | ||
63 | /* | ||
64 | * TX/RX data handlers. | ||
65 | */ | ||
66 | void rt2x00pci_txdone(struct queue_entry *entry, | ||
67 | struct txdone_entry_desc *txdesc) | ||
68 | { | ||
69 | struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev; | ||
70 | struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb); | ||
71 | |||
72 | /* | ||
73 | * Unmap the skb. | ||
74 | */ | ||
75 | rt2x00queue_unmap_skb(rt2x00dev, entry->skb); | ||
76 | |||
77 | /* | ||
78 | * Remove the extra tx headroom from the skb. | ||
79 | */ | ||
80 | skb_pull(entry->skb, rt2x00dev->ops->extra_tx_headroom); | ||
81 | |||
82 | /* | ||
83 | * Signal that the TX descriptor is no longer in the skb. | ||
84 | */ | ||
85 | skbdesc->flags &= ~SKBDESC_DESC_IN_SKB; | ||
86 | |||
87 | /* | ||
88 | * Pass on to rt2x00lib. | ||
89 | */ | ||
90 | rt2x00lib_txdone(entry, txdesc); | ||
91 | } | ||
92 | EXPORT_SYMBOL_GPL(rt2x00pci_txdone); | ||
93 | |||
94 | void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev) | 63 | void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev) |
95 | { | 64 | { |
96 | struct data_queue *queue = rt2x00dev->rx; | 65 | struct data_queue *queue = rt2x00dev->rx; |