4 files changed, 9 insertions, 29 deletions

diff --git a/drivers/net/wireless/p54/p54.h b/drivers/net/wireless/p54/p54.h
index 8da4d302059..1da96fe5024 100644
--- a/drivers/net/wireless/p54/p54.h
+++ b/drivers/net/wireless/p54/p54.h
@@ -67,7 +67,6 @@ struct p54_common {
         int (*open)(struct ieee80211_hw *dev);
         void (*stop)(struct ieee80211_hw *dev);
         int mode;
-        u16 seqno;
         u16 rx_mtu;
         u8 headroom;
         u8 tailroom;
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index f8cdd88e010..7c37d3fc1e2 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -856,19 +856,6 @@ static int p54_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
         if (padding)
                 txhdr->align[0] = padding;
 
-        /* FIXME: The sequence that follows is needed for this driver to
-         * work with mac80211 since "mac80211: fix TX sequence numbers".
-         * As with the temporary code in rt2x00, changes will be needed
-         * to get proper sequence numbers on beacons. In addition, this
-         * patch places the sequence number in the hardware state, which
-         * limits us to a single virtual state.
-         */
-        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-                if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
-                        priv->seqno += 0x10;
-                ieee80211hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
-                ieee80211hdr->seq_ctrl |= cpu_to_le16(priv->seqno);
-        }
         /* modifies skb->cb and with it info, so must be last! */
         p54_assign_address(dev, skb, hdr, skb->len);
 
@@ -1392,6 +1379,11 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
                      IEEE80211_HW_SIGNAL_DBM |
                      IEEE80211_HW_NOISE_DBM;
 
+        /*
+         * XXX: when this driver gets support for any mode that
+         *      requires beacons (AP, MESH, IBSS) then it must
+         *      implement IEEE80211_TX_CTL_ASSIGN_SEQ.
+         */
         dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
 
         dev->channel_change_time = 1000;        /* TODO: find actual value */
diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index e82bb4d289e..33725d0978b 100644
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -100,7 +100,6 @@ struct rtl8187_priv {
         struct usb_device *udev;
         u32 rx_conf;
         u16 txpwr_base;
-        u16 seqno;
         u8 asic_rev;
         u8 is_rtl8187b;
         enum {
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 2c69ab37c65..16f2fe2d849 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -241,20 +241,6 @@ static int rtl8187_tx(struct ieee80211_hw *dev, struct sk_buff *skb)
                         ep = epmap[skb_get_queue_mapping(skb)];
         }
 
-        /* FIXME: The sequence that follows is needed for this driver to
-         * work with mac80211 since "mac80211: fix TX sequence numbers".
-         * As with the temporary code in rt2x00, changes will be needed
-         * to get proper sequence numbers on beacons. In addition, this
-         * patch places the sequence number in the hardware state, which
-         * limits us to a single virtual state.
-         */
-        if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ) {
-                if (info->flags & IEEE80211_TX_CTL_FIRST_FRAGMENT)
-                        priv->seqno += 0x10;
-                ieee80211hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
-                ieee80211hdr->seq_ctrl |= cpu_to_le16(priv->seqno);
-        }
-
         info->driver_data[0] = dev;
         info->driver_data[1] = urb;
 
@@ -1187,6 +1173,10 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
                 dev->max_signal = 65;
         }
 
+        /*
+         * XXX: Once this driver supports anything that requires
+         *      beacons it must implement IEEE80211_TX_CTL_ASSIGN_SEQ.
+         */
         dev->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION);
 
         if ((id->driver_info == DEVICE_RTL8187) && priv->is_rtl8187b)