Pull error-inject into release branch

[linux-2.6] / net / ipv4 / ipconfig.c

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 4e19ee0e0102b261a00784cb2f5f4953db9cf9e9..597c800b2fdc5e15f33dd8b0d230d12546f2a2d6 100644 (file)
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -939,7 +939,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
                                        if (opt[1] >= 4)
                                                memcpy(&server_id, opt + 2, 4);
                                        break;
-                               };
+                               }
                        }
 
 #ifdef IPCONFIG_DEBUG
@@ -984,7 +984,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
                                ic_myaddr = NONE;
                                ic_servaddr = NONE;
                                goto drop_unlock;
-                       };
+                       }
 
                        ic_dhcp_msgtype = mt;