Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index e344c84c0ef9..a3c0dc9d8b98 100644
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -596,16 +596,16 @@ static int receive(struct net_device *dev, int cnt)
                                         if (!(notbitstream & (0x1fc << j)))
                                                 state = 0;
 
-                                        /* not flag received */
-                                        else if (!(bitstream & (0x1fe << j)) != (0x0fc << j)) {
+                                        /* flag received */
+                                        else if ((bitstream & (0x1fe << j)) == (0x0fc << j)) {
                                                 if (state)
                                                         do_rxpacket(dev);
                                                 bc->hdlcrx.bufcnt = 0;
                                                 bc->hdlcrx.bufptr = bc->hdlcrx.buf;
                                                 state = 1;
                                                 numbits = 7-j;
-                                                }
                                         }
+                                }
 
                                 /* stuffed bit */
                                 else if (unlikely((bitstream & (0x1f8 << j)) == (0xf8 << j))) {