[src/trunk]: src/sys/net Fix this properly by renaming the conflicting variab...

[jdc <jdc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4a79c7da74cb
branches:  trunk
changeset: 581462:4a79c7da74cb
user:      jdc <jdc%NetBSD.org@localhost>
date:      Wed Jun 01 19:45:34 2005 +0000

description:
Fix this properly by renaming the conflicting variables.

diffstat:

 sys/net/if_bridge.c |  19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

diffs (63 lines):

diff -r 88b2ec21c017 -r 4a79c7da74cb sys/net/if_bridge.c
--- a/sys/net/if_bridge.c       Wed Jun 01 19:40:58 2005 +0000
+++ b/sys/net/if_bridge.c       Wed Jun 01 19:45:34 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_bridge.c,v 1.30 2005/06/01 19:38:13 jdc Exp $       */
+/*     $NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $       */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.30 2005/06/01 19:38:13 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.31 2005/06/01 19:45:34 jdc Exp $");
 
 #include "opt_bridge_ipf.h"
 #include "opt_inet.h"
@@ -1968,6 +1968,7 @@
 {
        int snap, error;
        struct ether_header *eh1, eh2;
+       struct llc llc1;
        u_int16_t ether_type;
 
        snap = 0;
@@ -1979,13 +1980,13 @@
         * Check for SNAP/LLC.
         */
         if (ether_type < ETHERMTU) {
-                struct llc *llc = (struct llc *)(eh1 + 1);
+                struct llc *llc2 = (struct llc *)(eh1 + 1);
 
                 if ((*mp)->m_len >= ETHER_HDR_LEN + 8 &&
-                    llc->llc_dsap == LLC_SNAP_LSAP &&
-                    llc->llc_ssap == LLC_SNAP_LSAP &&
-                    llc->llc_control == LLC_UI) {
-                       ether_type = htons(llc->llc_un.type_snap.ether_type);
+                    llc2->llc_dsap == LLC_SNAP_LSAP &&
+                    llc2->llc_ssap == LLC_SNAP_LSAP &&
+                    llc2->llc_control == LLC_UI) {
+                       ether_type = htons(llc2->llc_un.type_snap.ether_type);
                        snap = 1;
                 }
         }
@@ -2018,7 +2019,7 @@
 
        /* Strip off snap header, if present */
        if (snap) {
-               m_copydata(*mp, 0, sizeof(struct llc), (caddr_t) &llc);
+               m_copydata(*mp, 0, sizeof(struct llc), (caddr_t) &llc1);
                m_adj(*mp, sizeof(struct llc));
        }
 
@@ -2058,7 +2059,7 @@
                M_PREPEND(*mp, sizeof(struct llc), M_DONTWAIT);
                if (*mp == NULL)
                        return error;
-               bcopy(&llc, mtod(*mp, caddr_t), sizeof(struct llc));
+               bcopy(&llc1, mtod(*mp, caddr_t), sizeof(struct llc));
        }
 
        M_PREPEND(*mp, ETHER_HDR_LEN, M_DONTWAIT);