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

Commit dec13b6b authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Remove redundant flags/dev_flags initializations 



the rxdesc structure is properly memsetted before passed to
the driver. This means we don't have to reinitialize the flags
and dev_flags fields in the drivers again.
This will prevent problems when the rxdone handler is adding
flags in a earlier status and will make the code look nicer
when we are adding more read attributes in the rxdone handler
in the driver.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7050ec82

drivers/net/wireless/rt2x00/rt2400pci.c

+1 −2
Original line number Diff line number Diff line
@@ -1087,7 +1087,6 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry, 
	rt2x00_desc_read(priv_rx->desc, 2, &word2);

	rt2x00_desc_read(priv_rx->desc, 3, &word3);



	rxdesc->flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))

		rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;

	if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
@@ -1103,7 +1102,7 @@ static void rt2400pci_fill_rxdone(struct queue_entry *entry, 
	    entry->queue->rt2x00dev->rssi_offset;

	rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);



	rxdesc->dev_flags = RXDONE_SIGNAL_PLCP;

	rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;

	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))

		rxdesc->dev_flags |= RXDONE_MY_BSS;

}

drivers/net/wireless/rt2x00/rt2500pci.c

+0 −2
Original line number Diff line number Diff line
@@ -1242,7 +1242,6 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry, 
	rt2x00_desc_read(priv_rx->desc, 0, &word0);

	rt2x00_desc_read(priv_rx->desc, 2, &word2);



	rxdesc->flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))

		rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;

	if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
@@ -1259,7 +1258,6 @@ static void rt2500pci_fill_rxdone(struct queue_entry *entry, 
	    entry->queue->rt2x00dev->rssi_offset;

	rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);



	rxdesc->dev_flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_OFDM))

		rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;

	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))

drivers/net/wireless/rt2x00/rt2500usb.c

+0 −2
Original line number Diff line number Diff line
@@ -1149,7 +1149,6 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry, 
	rt2x00_desc_read(rxd, 0, &word0);

	rt2x00_desc_read(rxd, 1, &word1);



	rxdesc->flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))

		rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;

	if (rt2x00_get_field32(word0, RXD_W0_PHYSICAL_ERROR))
@@ -1166,7 +1165,6 @@ static void rt2500usb_fill_rxdone(struct queue_entry *entry, 
	    entry->queue->rt2x00dev->rssi_offset;

	rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);



	rxdesc->dev_flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_OFDM))

		rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;

	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))

drivers/net/wireless/rt2x00/rt61pci.c

+0 −2
Original line number Diff line number Diff line
@@ -1668,7 +1668,6 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry, 
	rt2x00_desc_read(priv_rx->desc, 0, &word0);

	rt2x00_desc_read(priv_rx->desc, 1, &word1);



	rxdesc->flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))

		rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
@@ -1682,7 +1681,6 @@ static void rt61pci_fill_rxdone(struct queue_entry *entry, 
	rxdesc->rssi = rt61pci_agc_to_rssi(entry->queue->rt2x00dev, word1);

	rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);



	rxdesc->dev_flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_OFDM))

		rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;

	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))

drivers/net/wireless/rt2x00/rt73usb.c

+0 −2
Original line number Diff line number Diff line
@@ -1423,7 +1423,6 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry, 
	rt2x00_desc_read(rxd, 0, &word0);

	rt2x00_desc_read(rxd, 1, &word1);



	rxdesc->flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_CRC_ERROR))

		rxdesc->flags |= RX_FLAG_FAILED_FCS_CRC;
@@ -1437,7 +1436,6 @@ static void rt73usb_fill_rxdone(struct queue_entry *entry, 
	rxdesc->rssi = rt73usb_agc_to_rssi(entry->queue->rt2x00dev, word1);

	rxdesc->size = rt2x00_get_field32(word0, RXD_W0_DATABYTE_COUNT);



	rxdesc->dev_flags = 0;

	if (rt2x00_get_field32(word0, RXD_W0_OFDM))

		rxdesc->dev_flags |= RXDONE_SIGNAL_PLCP;

	if (rt2x00_get_field32(word0, RXD_W0_MY_BSS))