netdev
[Top] [All Lists]

[PATCH] baycom_epp.c: Fix compilation with gcc-4.1.0-20050522

To: netdev@xxxxxxxxxxx
Subject: [PATCH] baycom_epp.c: Fix compilation with gcc-4.1.0-20050522
From: Alexey Dobriyan <adobriyan@xxxxxxxxx>
Date: Fri, 27 May 2005 18:08:31 +0400
Cc: Thomas Sailer <t.sailer@xxxxxxxxxxxxxx>
Domainkey-signature: a=rsa-sha1; q=dns; c=nofws; s=beta; d=gmail.com; h=received:from:to:subject:date:user-agent:cc:mime-version:content-type:content-transfer-encoding:content-disposition:message-id; b=WYYibsWfuAIa9VsqJMZxNfod1EQE0arU38tNt9H+GhQN6X/ZjetWtoGBoO/1x1M1OO+7jFI1KhurgBvTTTaPP2ykSfXbrB6VLxO+hDa+/jnStZeVU4vdr5PwmyQm0c4veofSF3t6k5TSfgpzbV0mFCIzbyB/JiEXRh98E+SBKCk=
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: KMail/1.7.2
drivers/net/hamradio/baycom_epp.c:432: error: jump into statement expression
        ...

Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>

--- linux-vanilla/drivers/net/hamradio/baycom_epp.c     2005-05-27 
12:58:48.000000000 +0400
+++ linux-gcc4/drivers/net/hamradio/baycom_epp.c        2005-05-27 
17:54:14.000000000 +0400
@@ -380,22 +380,18 @@ static inline void do_kiss_params(struct
  */
 
 #define ENCODEITERA(j)                         \
-({                                             \
         if (!(notbitstream & (0x1f0 << j)))    \
                 goto stuff##j;                 \
-  encodeend##j:        ;                      \
-})
+  encodeend##j:        ;
 
 #define ENCODEITERB(j)                                          \
-({                                                              \
   stuff##j:                                                     \
         bitstream &= ~(0x100 << j);                             \
         bitbuf = (bitbuf & (((2 << j) << numbit) - 1)) |        \
                 ((bitbuf & ~(((2 << j) << numbit) - 1)) << 1);  \
         numbit++;                                               \
         notbitstream = ~bitstream;                              \
-        goto encodeend##j;                                      \
-})
+        goto encodeend##j;
 
 
 static void encode_hdlc(struct baycom_state *bc)
@@ -611,16 +607,13 @@ static void do_rxpacket(struct net_devic
 }
 
 #define DECODEITERA(j)                                                        \
-({                                                                            \
         if (!(notbitstream & (0x0fc << j)))              /* flag or abort */  \
                 goto flgabrt##j;                                              \
         if ((bitstream & (0x1f8 << j)) == (0xf8 << j))   /* stuffed bit */    \
                 goto stuff##j;                                                \
-  enditer##j:      ;                                                           
\
-})
+  enditer##j:      ;
 
 #define DECODEITERB(j)                                                         
        \
-({                                                                             
        \
   flgabrt##j:                                                                  
        \
         if (!(notbitstream & (0x1fc << j))) {              /* abort received 
*/        \
                 state = 0;                                                     
        \
@@ -638,8 +631,7 @@ static void do_rxpacket(struct net_devic
   stuff##j:                                                                    
        \
         numbits--;                                                             
        \
         bitbuf = (bitbuf & ((~0xff) << j)) | ((bitbuf & ~((~0xff) << j)) << 
1);        \
-        goto enditer##j;                                                       
        \
-})
+        goto enditer##j;
         
 static int receive(struct net_device *dev, int cnt)
 {

<Prev in Thread] Current Thread [Next in Thread>