linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@fs.tum.de>
To: Krzysztof Halasa <khc@pm.waw.pl>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-net@vger.kernel.org
Subject: Re: Linux v2.6.0-test2
Date: Mon, 28 Jul 2003 15:27:39 +0200	[thread overview]
Message-ID: <20030728132738.GH25402@fs.tum.de> (raw)
In-Reply-To: <Pine.LNX.4.44.0307271003360.3401-100000@home.osdl.org>

On Sun, Jul 27, 2003 at 10:08:40AM -0700, Linus Torvalds wrote:
>...
> Summary of changes from v2.6.0-test1 to v2.6.0-test2
> ============================================
>...
> Krzysztof Halasa:
>   o HDLC update
>...


This patch caused the following compile error:

<--  snip  -->

...
  CC      drivers/net/wan/pc300_drv.o
drivers/net/wan/pc300_drv.c: In function `cpc_ioctl':
drivers/net/wan/pc300_drv.c:2557: error: incompatible types in 
assignment
drivers/net/wan/pc300_drv.c:2593: error: incompatible types in 
assignment
drivers/net/wan/pc300_drv.c: In function `cpc_open':
drivers/net/wan/pc300_drv.c:3156: error: invalid operands to binary ==
drivers/net/wan/pc300_drv.c:3161: error: invalid operands to binary ==
drivers/net/wan/pc300_drv.c: In function `cpc_close':
drivers/net/wan/pc300_drv.c:3194: error: invalid operands to binary ==
make[3]: *** [drivers/net/wan/pc300_drv.o] Error 1

<--  snip  -->


Please check whether the fix below is correct.

TIA
Adrian


--- linux-2.6.0-test2-full-no-smp/drivers/net/wan/pc300_drv.c.tmp	2003-07-28 15:13:06.000000000 +0200
+++ linux-2.6.0-test2-full-no-smp/drivers/net/wan/pc300_drv.c	2003-07-28 15:19:35.000000000 +0200
@@ -2554,10 +2554,10 @@
 		case SIOCGPC300CONF:
 #ifdef CONFIG_PC300_MLPPP
 			if (conf->proto != PC300_PROTO_MLPPP) {
-				conf->proto = hdlc->proto;
+				conf->proto = hdlc->proto.id;
 			}
 #else
-			conf->proto = hdlc->proto;
+			conf->proto = hdlc->proto.id;
 #endif
 			memcpy(&conf_aux.conf, conf, sizeof(pc300chconf_t));
 			memcpy(&conf_aux.hw, &card->hw, sizeof(pc300hw_t));
@@ -2590,12 +2590,12 @@
 					}
 				} else {
 					memcpy(conf, &conf_aux.conf, sizeof(pc300chconf_t));
-					hdlc->proto = conf->proto;
+					hdlc->proto.id = conf->proto;
 				}
 			}
 #else
 			memcpy(conf, &conf_aux.conf, sizeof(pc300chconf_t));
-			hdlc->proto = conf->proto;
+			hdlc->proto.id = conf->proto;
 #endif
 			return 0;
 		case SIOCGPC300STATUS:
@@ -3153,12 +3153,12 @@
 	printk("pc300: cpc_open");
 #endif
 
-	if (hdlc->proto == IF_PROTO_PPP) {
+	if (hdlc->proto.id == IF_PROTO_PPP) {
 		d->if_ptr = &hdlc->state.ppp.pppdev;
 	}
 
 	result = hdlc_open(hdlc);
-	if (hdlc->proto == IF_PROTO_PPP) {
+	if (hdlc->proto.id == IF_PROTO_PPP) {
 		dev->priv = d;
 	}
 	if (result) {
@@ -3191,7 +3191,7 @@
 	CPC_UNLOCK(card, flags);
 
 	hdlc_close(hdlc);
-	if (hdlc->proto == IF_PROTO_PPP) {
+	if (hdlc->proto.id == IF_PROTO_PPP) {
 		d->if_ptr = NULL;
 	}
 #ifdef CONFIG_PC300_MLPPP


  parent reply	other threads:[~2003-07-28 13:12 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2003-07-27 17:08 Linus Torvalds
2003-07-27 17:23 ` where are the sources :-) Voicu Liviu
2003-07-27 17:27   ` Linus Torvalds
2003-07-27 19:24     ` Lukasz Trabinski
2003-07-28  3:03       ` Randy.Dunlap
2003-07-28  7:46         ` Lukasz Trabinski
2003-07-29  0:19           ` Mike Fedyk
2003-07-28  0:57     ` Erik Tews
2003-07-28  1:50       ` David S. Miller
2003-07-28  5:07       ` Voicu Liviu
2003-07-28  2:22     ` Larry McVoy
2003-07-28 10:03       ` Erik Tews
2003-07-27 19:42 ` Linux v2.6.0-test2 Harald Dunkel
2003-07-28  6:36   ` Otto Solares
2003-07-27 20:22 ` [PATCH] [TRIVIAL] Fix ipt_helper compilation. Was: " Florin Iucha
2003-07-28  1:55   ` David S. Miller
2003-07-27 21:45 ` Paco Ros
2003-07-28 13:03 ` [patch 2.6.0-test2: com20020_cs.c doesn't compile Adrian Bunk
2003-07-28 13:11   ` Christoph Hellwig
2003-07-28 13:27 ` Adrian Bunk [this message]
2003-07-29  7:25   ` Linux v2.6.0-test2 Francois Romieu
2003-07-29  7:33     ` Adrian Bunk
2003-07-29  0:14 ` Linux v2.6.0-test2 (compile stats) John Cherry
2003-07-30 21:27 ` dm: v4 ioctl interface (was: Re: Linux v2.6.0-test2) Geert Uytterhoeven
2003-07-30 21:39   ` Andrew Morton
2003-07-31  8:04     ` Geert Uytterhoeven
2003-07-29  8:41 Linux v2.6.0-test2 Oliver Pitzeier
2003-07-29 14:01 Christian Bornträger
2003-07-30 11:23 ` Herbert Xu
2003-07-30 12:48   ` Christian Bornträger
2003-07-30 15:25 ` Bill Davidsen
2003-07-29 15:41 Oliver Pitzeier

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=20030728132738.GH25402@fs.tum.de \
    --to=bunk@fs.tum.de \
    --cc=khc@pm.waw.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-net@vger.kernel.org \
    --subject='Re: Linux v2.6.0-test2' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).