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

Commit 739fd940 authored by Wolfgang Kufner's avatar Wolfgang Kufner Committed by John W. Linville
Browse files

rt2x00: Pad beacon to multiple of 32 bits. 



Pad beacon to a multiple of 32 bits in preparation for the change
from memcpy_toio() to __iowrite32_copy() in register_multiwrite().

Signed-off-by: default avatarWolfgang Kufner <wolfgang.kufner@gmail.com>
Acked-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e85b4c04

drivers/net/wireless/rt2x00/rt2800lib.c

+6 −3
Original line number Diff line number Diff line
@@ -772,6 +772,7 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) 
	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

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

	unsigned int beacon_base;

	unsigned int padding_len;

	u32 reg;



	/*
@@ -806,11 +807,13 @@ void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc) 
	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Write entire beacon with TXWI to register.

	 * Write entire beacon with TXWI and padding to register.

	 */

	padding_len = roundup(entry->skb->len, 4) - entry->skb->len;

	skb_pad(entry->skb, padding_len);

	beacon_base = HW_BEACON_OFFSET(entry->entry_idx);

	rt2800_register_multiwrite(rt2x00dev, beacon_base,

				   entry->skb->data, entry->skb->len);

	rt2800_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,

				   entry->skb->len + padding_len);



	/*

	 * Enable beaconing again.

drivers/net/wireless/rt2x00/rt61pci.c

+6 −2
Original line number Diff line number Diff line
@@ -1961,6 +1961,7 @@ static void rt61pci_write_beacon(struct queue_entry *entry, 
	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;

	struct queue_entry_priv_pci *entry_priv = entry->priv_data;

	unsigned int beacon_base;

	unsigned int padding_len;

	u32 reg;



	/*
@@ -1982,13 +1983,16 @@ static void rt61pci_write_beacon(struct queue_entry *entry, 
	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Write entire beacon with descriptor to register.

	 * Write entire beacon with descriptor and padding to register.

	 */

	padding_len = roundup(entry->skb->len, 4) - entry->skb->len;

	skb_pad(entry->skb, padding_len);

	beacon_base = HW_BEACON_OFFSET(entry->entry_idx);

	rt2x00pci_register_multiwrite(rt2x00dev, beacon_base,

				      entry_priv->desc, TXINFO_SIZE);

	rt2x00pci_register_multiwrite(rt2x00dev, beacon_base + TXINFO_SIZE,

				      entry->skb->data, entry->skb->len);

				      entry->skb->data,

				      entry->skb->len + padding_len);



	/*

	 * Enable beaconing again.

drivers/net/wireless/rt2x00/rt73usb.c

+6 −3
Original line number Diff line number Diff line
@@ -1546,6 +1546,7 @@ static void rt73usb_write_beacon(struct queue_entry *entry, 
{

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

	unsigned int beacon_base;

	unsigned int padding_len;

	u32 reg;



	/*
@@ -1573,11 +1574,13 @@ static void rt73usb_write_beacon(struct queue_entry *entry, 
	rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_BEACON, entry->skb);



	/*

	 * Write entire beacon with descriptor to register.

	 * Write entire beacon with descriptor and padding to register.

	 */

	padding_len = roundup(entry->skb->len, 4) - entry->skb->len;

	skb_pad(entry->skb, padding_len);

	beacon_base = HW_BEACON_OFFSET(entry->entry_idx);

	rt2x00usb_register_multiwrite(rt2x00dev, beacon_base,

				      entry->skb->data, entry->skb->len);

	rt2x00usb_register_multiwrite(rt2x00dev, beacon_base, entry->skb->data,

				      entry->skb->len + padding_len);



	/*

	 * Enable beaconing again.