Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 354e39db authored by Gertjan van Wingerde's avatar Gertjan van Wingerde Committed by John W. Linville
Browse files

rt2x00: Remove SKBDESC_L2_PADDED flag. 



With the improved L2 padding code, this flag is no longer necessary, as the
rt2x00queue_remove_l2pad is capable of detecting by itself if L2 padding is
applied.
For received frames the RX descriptor flag is still being checked.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Acked-by: default avatarIvo van Doorn <ivdoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 77e73d18

drivers/net/wireless/rt2x00/rt2800pci.c

+1 −4
Original line number Diff line number Diff line
@@ -835,7 +835,6 @@ static void rt2800pci_fill_rxdone(struct queue_entry *entry, 
				  struct rxdone_entry_desc *rxdesc)

{

	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	__le32 *rxd = entry_priv->desc;

	__le32 *rxwi = (__le32 *)entry->skb->data;
@@ -883,10 +882,8 @@ static void rt2800pci_fill_rxdone(struct queue_entry *entry, 
	if (rt2x00_get_field32(rxd3, RXD_W3_MY_BSS))

		rxdesc->dev_flags |= RXDONE_MY_BSS;



	if (rt2x00_get_field32(rxd3, RXD_W3_L2PAD)) {

	if (rt2x00_get_field32(rxd3, RXD_W3_L2PAD))

		rxdesc->dev_flags |= RXDONE_L2PAD;

		skbdesc->flags |= SKBDESC_L2_PADDED;

	}



	if (rt2x00_get_field32(rxwi1, RXWI_W1_SHORT_GI))

		rxdesc->flags |= RX_FLAG_SHORT_GI;

drivers/net/wireless/rt2x00/rt2800usb.c

+1 −3
Original line number Diff line number Diff line
@@ -625,10 +625,8 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry, 
	if (rt2x00_get_field32(rxd0, RXINFO_W0_MY_BSS))

		rxdesc->dev_flags |= RXDONE_MY_BSS;



	if (rt2x00_get_field32(rxd0, RXINFO_W0_L2PAD)) {

	if (rt2x00_get_field32(rxd0, RXINFO_W0_L2PAD))

		rxdesc->dev_flags |= RXDONE_L2PAD;

		skbdesc->flags |= SKBDESC_L2_PADDED;

	}



	if (rt2x00_get_field32(rxwi1, RXWI_W1_SHORT_GI))

		rxdesc->flags |= RX_FLAG_SHORT_GI;

drivers/net/wireless/rt2x00/rt2x00queue.c

+1 −5
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ void rt2x00queue_align_payload(struct sk_buff *skb, unsigned int header_length) 


void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	unsigned int frame_length = skb->len;

	unsigned int header_align = ALIGN_SIZE(skb, 0);

	unsigned int payload_align = ALIGN_SIZE(skb, header_length);
@@ -198,7 +197,6 @@ void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length) 
		 */

		skb_push(skb, header_align);

		memmove(skb->data, skb->data + header_align, header_length);

		skbdesc->flags |= SKBDESC_L2_PADDED;

	} else {

		/*

		 *
@@ -217,16 +215,14 @@ void rt2x00queue_insert_l2pad(struct sk_buff *skb, unsigned int header_length) 
			skb->data + header_length + l2pad + payload_align,

			frame_length - header_length);

		skb_trim(skb, frame_length + l2pad);

		skbdesc->flags |= SKBDESC_L2_PADDED;

	}

}



void rt2x00queue_remove_l2pad(struct sk_buff *skb, unsigned int header_length)

{

	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);

	unsigned int l2pad = L2PAD_SIZE(header_length);



	if (!l2pad || (skbdesc->flags & SKBDESC_L2_PADDED))

	if (!l2pad)

		return;



	memmove(skb->data + l2pad, skb->data, header_length);

drivers/net/wireless/rt2x00/rt2x00queue.h

+1 −4
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ enum data_queue_qid { 
 * @SKBDESC_DMA_MAPPED_TX: &skb_dma field has been mapped for TX

 * @SKBDESC_IV_STRIPPED: Frame contained a IV/EIV provided by

 *	mac80211 but was stripped for processing by the driver.

 * @SKBDESC_L2_PADDED: Payload has been padded for 4-byte alignment,

 *	the padded bytes are located between header and payload.

 * @SKBDESC_NOT_MAC80211: Frame didn't originate from mac80211,

 *	don't try to pass it back.

 */
@@ -101,8 +99,7 @@ enum skb_frame_desc_flags { 
	SKBDESC_DMA_MAPPED_RX = 1 << 0,

	SKBDESC_DMA_MAPPED_TX = 1 << 1,

	SKBDESC_IV_STRIPPED = 1 << 2,

	SKBDESC_L2_PADDED = 1 << 3,

	SKBDESC_NOT_MAC80211 = 1 << 4,

	SKBDESC_NOT_MAC80211 = 1 << 3,

};



/**