lkml.org 
[lkml]   [2005]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[9/14] Orinoco driver updates - update is_ethersnap()
    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
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:10    [W:3.366 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site