Merge tag 'pci-v5.18-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / staging / vt6656 / rxtx.c

diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c
index a31947f2620deab51362dcb2ca4dd53cfd902b56..4d29f8ebb39303266b1893d3395f1393a9e51b8e 100644 (file)
--- a/drivers/staging/vt6656/rxtx.c
+++ b/drivers/staging/vt6656/rxtx.c
@@ -58,8 +58,6 @@ static struct vnt_usb_send_context
        struct vnt_usb_send_context *context = NULL;
        int ii;
 
-       dev_dbg(&priv->usb->dev, "%s\n", __func__);
-
        for (ii = 0; ii < priv->num_tx_context; ii++) {
                if (!priv->tx_context[ii])
                        return NULL;
@@ -355,10 +353,8 @@ static bool vnt_fill_txkey(struct vnt_tx_buffer *tx_buffer, struct sk_buff *skb)
                ether_addr_copy(mic_hdr->addr2, hdr->addr2);
                ether_addr_copy(mic_hdr->addr3, hdr->addr3);
 
-               mic_hdr->frame_control = cpu_to_le16(
-                       le16_to_cpu(hdr->frame_control) & 0xc78f);
-               mic_hdr->seq_ctrl = cpu_to_le16(
-                               le16_to_cpu(hdr->seq_ctrl) & 0xf);
+               mic_hdr->frame_control = cpu_to_le16(le16_to_cpu(hdr->frame_control) & 0xc78f);
+               mic_hdr->seq_ctrl = cpu_to_le16(le16_to_cpu(hdr->seq_ctrl) & 0xf);
 
                if (ieee80211_has_a4(hdr->frame_control))
                        ether_addr_copy(mic_hdr->addr4, hdr->addr4);