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

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

rt2x00: Cleanup struct skb_frame_desc. 



The data and data_len fields aren't really necessary in struct
skb_frame_desc, as they can be deduced from the skb itself.

Signed-off-by: default avatarGertjan van Wingerde <gwingerde@kpnplanet.nl>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent b869767b

drivers/net/wireless/rt2x00/rt2400pci.c

+2 −4
Original line number Diff line number Diff line
@@ -1016,8 +1016,8 @@ static void rt2400pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_desc_write(entry_priv->desc, 1, word);



	rt2x00_desc_read(txd, 2, &word);

	rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH, skbdesc->data_len);

	rt2x00_set_field32(&word, TXD_W2_DATABYTE_COUNT, skbdesc->data_len);

	rt2x00_set_field32(&word, TXD_W2_BUFFER_LENGTH, skb->len);

	rt2x00_set_field32(&word, TXD_W2_DATABYTE_COUNT, skb->len);

	rt2x00_desc_write(txd, 2, word);



	rt2x00_desc_read(txd, 3, &word);
@@ -1507,8 +1507,6 @@ static int rt2400pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) 
	 */

	skbdesc = get_skb_frame_desc(skb);

	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->data = skb->data;

	skbdesc->data_len = skb->len;

	skbdesc->desc = entry_priv->desc;

	skbdesc->desc_len = intf->beacon->queue->desc_size;

	skbdesc->entry = intf->beacon;

drivers/net/wireless/rt2x00/rt2500pci.c

+0 −2
Original line number Diff line number Diff line
@@ -1823,8 +1823,6 @@ static int rt2500pci_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) 
	 */

	skbdesc = get_skb_frame_desc(skb);

	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->data = skb->data;

	skbdesc->data_len = skb->len;

	skbdesc->desc = entry_priv->desc;

	skbdesc->desc_len = intf->beacon->queue->desc_size;

	skbdesc->entry = intf->beacon;

drivers/net/wireless/rt2x00/rt2500usb.c

+2 −5
Original line number Diff line number Diff line
@@ -1088,7 +1088,8 @@ static void rt2500usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, 
	rt2x00_set_field32(&word, TXD_W0_NEW_SEQ,

			   test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags));

	rt2x00_set_field32(&word, TXD_W0_IFS, txdesc->ifs);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT, skbdesc->data_len);

	rt2x00_set_field32(&word, TXD_W0_DATABYTE_COUNT,

			   skb->len - skbdesc->desc_len);

	rt2x00_set_field32(&word, TXD_W0_CIPHER, CIPHER_NONE);

	rt2x00_desc_write(txd, 0, word);

}
@@ -1196,8 +1197,6 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry, 
	 * Adjust the skb memory window to the frame boundaries.

	 */

	skb_trim(entry->skb, rxdesc->size);

	skbdesc->data = entry->skb->data;

	skbdesc->data_len = rxdesc->size;

}



/*
@@ -1711,8 +1710,6 @@ static int rt2500usb_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) 
	 */

	skbdesc = get_skb_frame_desc(skb);

	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->data = skb->data + intf->beacon->queue->desc_size;

	skbdesc->data_len = skb->len - intf->beacon->queue->desc_size;

	skbdesc->desc = skb->data;

	skbdesc->desc_len = intf->beacon->queue->desc_size;

	skbdesc->entry = intf->beacon;

drivers/net/wireless/rt2x00/rt2x00debug.c

+3 −3
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
		return;

	}



	skbcopy = alloc_skb(sizeof(*dump_hdr) + desc->desc_len + desc->data_len,

	skbcopy = alloc_skb(sizeof(*dump_hdr) + desc->desc_len + skb->len,

			    GFP_ATOMIC);

	if (!skbcopy) {

		DEBUG(rt2x00dev, "Failed to copy skb for dump.\n");
@@ -144,7 +144,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
	dump_hdr->version = cpu_to_le32(DUMP_HEADER_VERSION);

	dump_hdr->header_length = cpu_to_le32(sizeof(*dump_hdr));

	dump_hdr->desc_length = cpu_to_le32(desc->desc_len);

	dump_hdr->data_length = cpu_to_le32(desc->data_len);

	dump_hdr->data_length = cpu_to_le32(skb->len);

	dump_hdr->chip_rt = cpu_to_le16(rt2x00dev->chip.rt);

	dump_hdr->chip_rf = cpu_to_le16(rt2x00dev->chip.rf);

	dump_hdr->chip_rev = cpu_to_le32(rt2x00dev->chip.rev);
@@ -155,7 +155,7 @@ void rt2x00debug_dump_frame(struct rt2x00_dev *rt2x00dev, 
	dump_hdr->timestamp_usec = cpu_to_le32(timestamp.tv_usec);



	memcpy(skb_put(skbcopy, desc->desc_len), desc->desc, desc->desc_len);

	memcpy(skb_put(skbcopy, desc->data_len), desc->data, desc->data_len);

	memcpy(skb_put(skbcopy, skb->len), skb->data, skb->len);



	skb_queue_tail(&intf->frame_dump_skbqueue, skbcopy);

	wake_up_interruptible(&intf->frame_dump_waitqueue);

drivers/net/wireless/rt2x00/rt2x00pci.c

+0 −4
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ int rt2x00pci_write_tx_data(struct queue_entry *entry) 
	 */

	skbdesc = get_skb_frame_desc(entry->skb);

	memset(skbdesc, 0, sizeof(*skbdesc));

	skbdesc->data = entry->skb->data;

	skbdesc->data_len = entry->skb->len;

	skbdesc->desc = entry_priv->desc;

	skbdesc->desc_len = entry->queue->desc_size;

	skbdesc->entry = entry;
@@ -126,8 +124,6 @@ void rt2x00pci_rxdone(struct rt2x00_dev *rt2x00dev) 
		 */

		skbdesc = get_skb_frame_desc(entry->skb);

		memset(skbdesc, 0, sizeof(*skbdesc));

		skbdesc->data = entry->skb->data;

		skbdesc->data_len = entry->skb->len;

		skbdesc->desc = entry_priv->desc;

		skbdesc->desc_len = queue->desc_size;

		skbdesc->entry = entry;