From patchwork Sat May 23 21:27:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pascal Terjan X-Patchwork-Id: 11567013 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C703690 for ; Sat, 23 May 2020 21:27:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id ABEE3207FB for ; Sat, 23 May 2020 21:27:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="Hb4EWUiL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388110AbgEWV1t (ORCPT ); Sat, 23 May 2020 17:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387905AbgEWV1t (ORCPT ); Sat, 23 May 2020 17:27:49 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7597C05BD43 for ; Sat, 23 May 2020 14:27:47 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id s8so13174089ybj.9 for ; Sat, 23 May 2020 14:27:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=L7hPQvY2NIf4meJrg9SAHQ2svkS/4rdW/+N34fTKjso=; b=Hb4EWUiLNML4nAz2rpesxRQ3Xui71Qj89OfwfSHj9V4QiHPwZcMHwuf0RSOkNFix8D Cwb//Nc0K3oXE78uSX2KvrGQuwktkdmGND/sy466Tui/B056QjaGvSP1dtqoB0WvXthA 0807ZieAJnvaQYOiZ7LWnTKoes3+17uK+7MCau8uULig1fq/FB8DH0GadbFtpxI4IsGR amCM8Hzpm8gp8ncdPu8egBC7VPFWX52gtuY+HOk+nkHYfA+44zO80L4OVWZi/HwdayDs xof3VJdd3Cq3INRQnW2tGnhDD0H+1jvrfr/xx2ZjJnz1KMwSCPjS/681DLnFQq6EL9Nf AhTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=L7hPQvY2NIf4meJrg9SAHQ2svkS/4rdW/+N34fTKjso=; b=bey+MD7Hg0DGq8aMRAqpP8hsq3uYjiKSGE1SB7WuRYqRunY05yAQnxnmvWbNZbZs/2 voq/twVtGJbR6Z5HEZF5z0mEEqUPTQ6vK4pa0WBL3QiCvPcbHCpldH7LKYOPRbU4RL1G U3Jal8O65W1DVkCUN+cgZT7UUChWhgdZQM7B9u1fg0OgRCUjyVBd1NPsA6C6S3zMQuaW IC1e7/FkoSupDKibsfiwdQ8uLKQWrwCaMmbdaCebnwUDAI6C5k/iic9fx3NfDpNz1pmS a9C33CeOxAQzq3sjVm+7rXD7n0xWChajxGvXzJ4mzlIj6OHhmurDroZ49z8cfu9uDGoX 5K9Q== X-Gm-Message-State: AOAM530rF3o97XD4pk0iaqYrp/YGF6n5giL7u9Q6qjwOp1vULiUlcTwl ldpKTSGBxX3iQenippkMM7bsmIyB2B3G X-Google-Smtp-Source: ABdhPJzlNWcVHOMWGwLCGzq9m9H3VHSJkfIikGT3epD7agMuS7DCu02ze0nAP7jyATxoOh5dWnFoWcT6Ewoe X-Received: by 2002:a25:253:: with SMTP id 80mr18381858ybc.405.1590269266946; Sat, 23 May 2020 14:27:46 -0700 (PDT) Date: Sat, 23 May 2020 22:27:35 +0100 Message-Id: <20200523212735.32364-1-pterjan@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.27.0.rc0.183.gde8f92d652-goog Subject: [PATCH] atmel: Use shared constant for rfc1042 header From: Pascal Terjan To: Simon Kelley , Kalle Valo , "David S. Miller" , Jakub Kicinski , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Pascal Terjan Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This is one of the 9 drivers redefining rfc1042_header. Signed-off-by: Pascal Terjan --- drivers/net/wireless/atmel/atmel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c index 74538085cfb7..d5875836068c 100644 --- a/drivers/net/wireless/atmel/atmel.c +++ b/drivers/net/wireless/atmel/atmel.c @@ -798,7 +798,6 @@ static void tx_update_descriptor(struct atmel_private *priv, int is_bcast, static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) { - static const u8 SNAP_RFC1024[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; struct atmel_private *priv = netdev_priv(dev); struct ieee80211_hdr header; unsigned long flags; @@ -853,7 +852,7 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) } if (priv->use_wpa) - memcpy(&header.addr4, SNAP_RFC1024, ETH_ALEN); + memcpy(&header.addr4, rfc1042_header, ETH_ALEN); header.frame_control = cpu_to_le16(frame_ctl); /* Copy the wireless header into the card */