mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: David Gibson <hermes@gibson.dropbear.id.au>
To: Jeff Garzik <jgarzik@pobox.com>, Pavel Roskin <proski@gnu.org>,
	Orinoco Development List <orinoco-devel@lists.sourceforge.net>,
	netdev@oss.sgi.com, linux-kernel@vger.kernel.org
Subject: [9/14] Orinoco driver updates - update is_ethersnap()
Date: Thu, 24 Feb 2005 15:01:53 +1100	[thread overview]
Message-ID: <20050224040153.GK32001@localhost.localdomain> (raw)
In-Reply-To: <20050224040052.GJ32001@localhost.localdomain>

Make the is_ethersnap() function take a void * rather than a pointer
to the internal header structure.  This makes more logical sense and
reduces dependencies between different parts of the code.

Signed-off-by: David Gibson <hermes@gibson.dropbear.id.au>

Index: working-2.6/drivers/net/wireless/orinoco.c
===================================================================
--- working-2.6.orig/drivers/net/wireless/orinoco.c	2005-02-24 14:50:48.426788064 +1100
+++ working-2.6/drivers/net/wireless/orinoco.c	2005-02-24 14:50:50.125529816 +1100
@@ -966,15 +966,17 @@
 
 /* Does the frame have a SNAP header indicating it should be
  * de-encapsulated to Ethernet-II? */
-static inline int is_ethersnap(struct header_struct *hdr)
+static inline int is_ethersnap(void *_hdr)
 {
+	u8 *hdr = _hdr;
+
 	/* We de-encapsulate all packets which, a) have SNAP headers
 	 * (i.e. SSAP=DSAP=0xaa and CTRL=0x3 in the 802.2 LLC header
 	 * and where b) the OUI of the SNAP header is 00:00:00 or
 	 * 00:00:f8 - we need both because different APs appear to use
 	 * different OUIs for some reason */
-	return (memcmp(&hdr->dsap, &encaps_hdr, 5) == 0)
-		&& ( (hdr->oui[2] == 0x00) || (hdr->oui[2] == 0xf8) );
+	return (memcmp(hdr, &encaps_hdr, 5) == 0)
+		&& ( (hdr[5] == 0x00) || (hdr[5] == 0xf8) );
 }
 
 static inline void orinoco_spy_gather(struct net_device *dev, u_char *mac,

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist.  NOT _the_ _other_ _way_
				| _around_!
http://www.ozlabs.org/people/dgibson

  reply	other threads:[~2005-02-24  4:20 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-02-24  3:53 [0/14] Orinoco driver updates David Gibson
2005-02-24  3:54 ` [1/14] Orinoco driver updates - use netif_carrier_*() David Gibson
2005-02-24  3:55   ` [2/14] Orinoco driver updates - update printk()s David Gibson
2005-02-24  3:56     ` [3/14] Orinoco driver updates - use mdelay()/ssleep() more David Gibson
2005-02-24  3:57       ` [4/14] Orinoco driver updates - add free_orinocodev() David Gibson
2005-02-24  3:58         ` [5/14] Orinoco driver updates - cleanup low-level code David Gibson
2005-02-24  3:59           ` [6/14] Orinoco driver updates - cleanup PCI initialization David Gibson
2005-02-24  4:00             ` [7/14] Orinoco driver updates - use modern module_parm() David Gibson
2005-02-24  4:00               ` [8/14] Orinoco driver updates - PCMCIA initialization cleanups David Gibson
2005-02-24  4:01                 ` David Gibson [this message]
2005-02-24  4:02                   ` [10/14] Orinoco driver updates - prohibit IBSS with no ESSID David Gibson
2005-02-24  4:02                     ` [11/14] Orinoco driver updates - delay Tx wake David Gibson
2005-02-24  4:03                       ` [12/14] Orinoco driver updates - WEP updates David Gibson
2005-02-24  4:04                         ` [13/14] Orinoco driver updates - update firmware detection David Gibson
2005-02-24  4:05                           ` [14/14] Orinoco driver updates - update version and changelog David Gibson
2005-02-24  4:44                             ` Jeff Garzik
2005-02-24  6:55                 ` [8/14] Orinoco driver updates - PCMCIA initialization cleanups Dominik Brodowski
2005-02-24  7:29                   ` Jeff Garzik
2005-02-25  5:03                     ` [Orinoco-devel] " David Gibson
2005-02-25  7:02                       ` Dominik Brodowski
2005-02-24  4:35               ` [7/14] Orinoco driver updates - use modern module_parm() Jeff Garzik
2005-02-24  4:35             ` [6/14] Orinoco driver updates - cleanup PCI initialization Jeff Garzik
2005-02-25  4:58               ` [Orinoco-devel] " David Gibson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050224040153.GK32001@localhost.localdomain \
    --to=hermes@gibson.dropbear.id.au \
    --cc=jgarzik@pobox.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@oss.sgi.com \
    --cc=orinoco-devel@lists.sourceforge.net \
    --cc=proski@gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®