aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGertjan van Wingerde <gwingerde@gmail.com>2011-01-30 07:23:22 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-01-31 15:06:25 -0500
commita0aff623ca8bc8779e6c3a394772d70d8a65dee9 (patch)
tree23a5b466c7131cf0d61c0ef02c6d6080d90f70bf /drivers
parent10026f77b3555af13e43b8de0a91ad94cd2119d7 (diff)
rt2x00: Fix FIXME comments in rt61pci and rt73usb on Michael MIC.
Both rt61pci and rt73usb check the Michael MIC in hardware and strip the Michael MIC from received frames. This is perfectly allowed by mac80211 as long as this is properly reported to mac80211. Both these drivers reported the Michael MIC handling properly to mac80211, but still contained a FIXME comment on this, which is not needed to be handled, since mac80211 doesn't really need the Michael MIC in this case. 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')
-rw-r--r--drivers/net/wireless/rt2x00/rt61pci.c5
-rw-r--r--drivers/net/wireless/rt2x00/rt73usb.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 3afafabda080..dd2164d4d57b 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2118,9 +2118,8 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry,
2118 rxdesc->flags |= RX_FLAG_IV_STRIPPED; 2118 rxdesc->flags |= RX_FLAG_IV_STRIPPED;
2119 2119
2120 /* 2120 /*
2121 * FIXME: Legacy driver indicates that the frame does 2121 * The hardware has already checked the Michael Mic and has
2122 * contain the Michael Mic. Unfortunately, in rt2x00 2122 * stripped it from the frame. Signal this to mac80211.
2123 * the MIC seems to be missing completely...
2124 */ 2123 */
2125 rxdesc->flags |= RX_FLAG_MMIC_STRIPPED; 2124 rxdesc->flags |= RX_FLAG_MMIC_STRIPPED;
2126 2125
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index aa9c61c7f376..5ff72deea8d4 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1709,9 +1709,8 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry,
1709 rxdesc->flags |= RX_FLAG_IV_STRIPPED; 1709 rxdesc->flags |= RX_FLAG_IV_STRIPPED;
1710 1710
1711 /* 1711 /*
1712 * FIXME: Legacy driver indicates that the frame does 1712 * The hardware has already checked the Michael Mic and has
1713 * contain the Michael Mic. Unfortunately, in rt2x00 1713 * stripped it from the frame. Signal this to mac80211.
1714 * the MIC seems to be missing completely...
1715 */ 1714 */
1716 rxdesc->flags |= RX_FLAG_MMIC_STRIPPED; 1715 rxdesc->flags |= RX_FLAG_MMIC_STRIPPED;
1717 1716