Module Name: src
Committed By: tron
Date: Tue Jul 19 19:42:27 UTC 2011
Modified Files:
src/sys/net: if_tokensubr.c
Log Message:
Fix weird hardware address assignment that GCC 4.5 complains about.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/net/if_tokensubr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_tokensubr.c
diff -u src/sys/net/if_tokensubr.c:1.60 src/sys/net/if_tokensubr.c:1.61
--- src/sys/net/if_tokensubr.c:1.60 Mon Apr 5 07:22:24 2010
+++ src/sys/net/if_tokensubr.c Tue Jul 19 19:42:27 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tokensubr.c,v 1.60 2010/04/05 07:22:24 joerg Exp $ */
+/* $NetBSD: if_tokensubr.c,v 1.61 2011/07/19 19:42:27 tron Exp $ */
/*
* Copyright (c) 1982, 1989, 1993
@@ -92,7 +92,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.60 2010/04/05 07:22:24 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tokensubr.c,v 1.61 2011/07/19 19:42:27 tron Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -597,10 +597,8 @@
sa.sa_len = sizeof(sa);
eh = (struct ether_header *)sa.sa_data;
for (i = 0; i < ISO88025_ADDR_LEN; i++) {
- eh->ether_shost[i] = c = trh->token_dhost[i];
- eh->ether_dhost[i] =
- eh->ether_dhost[i] = trh->token_shost[i];
- eh->ether_shost[i] = c;
+ eh->ether_shost[i] = trh->token_dhost[i];
+ eh->ether_dhost[i] = trh->token_shost[i];
}
eh->ether_type = 0;
m_adj(m, lan_hdr_len);
