1 files changed, 7 insertions, 13 deletions

diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index 92ac7e7363a0..67e8a6b086ea 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -808,8 +808,6 @@ static void __init ic_bootp_send_if(struct ic_device *d, unsigned long jiffies_d
         b->op = BOOTP_REQUEST;
         if (dev->type < 256) /* check for false types */
                 b->htype = dev->type;
-        else if (dev->type == ARPHRD_IEEE802_TR) /* fix for token ring */
-                b->htype = ARPHRD_IEEE802;
         else if (dev->type == ARPHRD_FDDI)
                 b->htype = ARPHRD_ETHER;
         else {
@@ -955,8 +953,7 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
 
         /* Fragments are not supported */
         if (ip_is_fragment(h)) {
-                if (net_ratelimit())
-                        pr_err("DHCP/BOOTP: Ignoring fragmented reply\n");
+                net_err_ratelimited("DHCP/BOOTP: Ignoring fragmented reply\n");
                 goto drop;
         }
 
@@ -1004,16 +1001,14 @@ static int __init ic_bootp_recv(struct sk_buff *skb, struct net_device *dev, str
         /* Is it a reply to our BOOTP request? */
         if (b->op != BOOTP_REPLY ||
             b->xid != d->xid) {
-                if (net_ratelimit())
-                        pr_err("DHCP/BOOTP: Reply not for us, op[%x] xid[%x]\n",
-                               b->op, b->xid);
+                net_err_ratelimited("DHCP/BOOTP: Reply not for us, op[%x] xid[%x]\n",
+                                    b->op, b->xid);
                 goto drop_unlock;
         }
 
         /* Is it a reply for the device we are configuring? */
         if (b->xid != ic_dev_xid) {
-                if (net_ratelimit())
-                        pr_err("DHCP/BOOTP: Ignoring delayed packet\n");
+                net_err_ratelimited("DHCP/BOOTP: Ignoring delayed packet\n");
                 goto drop_unlock;
         }
 
@@ -1198,7 +1193,7 @@ static int __init ic_dynamic(void)
         d = ic_first_dev;
         retries = CONF_SEND_RETRIES;
         get_random_bytes(&timeout, sizeof(timeout));
-        timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned) CONF_TIMEOUT_RANDOM);
+        timeout = CONF_BASE_TIMEOUT + (timeout % (unsigned int) CONF_TIMEOUT_RANDOM);
         for (;;) {
                 /* Track the device we are configuring */
                 ic_dev_xid = d->xid;
@@ -1626,11 +1621,13 @@ static int __init ip_auto_config_setup(char *addrs)
 
         return 1;
 }
+__setup("ip=", ip_auto_config_setup);
 
 static int __init nfsaddrs_config_setup(char *addrs)
 {
         return ip_auto_config_setup(addrs);
 }
+__setup("nfsaddrs=", nfsaddrs_config_setup);
 
 static int __init vendor_class_identifier_setup(char *addrs)
 {
@@ -1641,7 +1638,4 @@ static int __init vendor_class_identifier_setup(char *addrs)
                         vendor_class_identifier);
         return 1;
 }
-
-__setup("ip=", ip_auto_config_setup);
-__setup("nfsaddrs=", nfsaddrs_config_setup);
 __setup("dhcpclass=", vendor_class_identifier_setup);