drivers: replace NIPQUAD()

[safe/jmp/linux-2.6] / drivers / net / bonding / bond_sysfs.c

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index dd265c6..296a865 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -53,7 +53,6 @@ extern struct bond_parm_tbl arp_validate_tbl[];
 extern struct bond_parm_tbl fail_over_mac_tbl[];
 
 static int expected_refcount = -1;
-static struct class *netdev_class;
 /*--------------------------- Data Structures -----------------------------*/
 
 /* Bonding sysfs lock.  Why can't we just use the subsystem lock?
@@ -351,9 +350,6 @@ static ssize_t bonding_store_slaves(struct device *d,
                if (dev) {
                        printk(KERN_INFO DRV_NAME ": %s: Removing slave %s\n",
                                bond->dev->name, dev->name);
-                       if (bond->setup_by_slave)
-                               res = bond_release_and_destroy(bond->dev, dev);
-                       else
                                res = bond_release(bond->dev, dev);
                        if (res) {
                                ret = res;
@@ -676,8 +672,8 @@ static ssize_t bonding_show_arp_targets(struct device *d,
 
        for (i = 0; i < BOND_MAX_ARP_TARGETS; i++) {
                if (bond->params.arp_targets[i])
-                       res += sprintf(buf + res, "%u.%u.%u.%u ",
-                              NIPQUAD(bond->params.arp_targets[i]));
+                       res += sprintf(buf + res, "%pI4 ",
+                                      &bond->params.arp_targets[i]);
        }
        if (res)
                buf[res-1] = '\n'; /* eat the leftover space */
@@ -699,8 +695,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
        if (buf[0] == '+') {
                if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
                        printk(KERN_ERR DRV_NAME
-                              ": %s: invalid ARP target %u.%u.%u.%u specified for addition\n",
-                              bond->dev->name, NIPQUAD(newtarget));
+                              ": %s: invalid ARP target %pI4 specified for addition\n",
+                              bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
@@ -708,8 +704,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
                        if (targets[i] == newtarget) { /* duplicate */
                                printk(KERN_ERR DRV_NAME
-                                      ": %s: ARP target %u.%u.%u.%u is already present\n",
-                                      bond->dev->name, NIPQUAD(newtarget));
+                                      ": %s: ARP target %pI4 is already present\n",
+                                      bond->dev->name, &newtarget);
                                if (done)
                                        targets[i] = 0;
                                ret = -EINVAL;
@@ -717,8 +713,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                        }
                        if (targets[i] == 0 && !done) {
                                printk(KERN_INFO DRV_NAME
-                                      ": %s: adding ARP target %d.%d.%d.%d.\n",
-                                      bond->dev->name, NIPQUAD(newtarget));
+                                      ": %s: adding ARP target %pI4.\n",
+                                      bond->dev->name, &newtarget);
                                done = 1;
                                targets[i] = newtarget;
                        }
@@ -735,8 +731,8 @@ static ssize_t bonding_store_arp_targets(struct device *d,
        else if (buf[0] == '-') {
                if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
                        printk(KERN_ERR DRV_NAME
-                              ": %s: invalid ARP target %d.%d.%d.%d specified for removal\n",
-                              bond->dev->name, NIPQUAD(newtarget));
+                              ": %s: invalid ARP target %pI4 specified for removal\n",
+                              bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
@@ -744,16 +740,16 @@ static ssize_t bonding_store_arp_targets(struct device *d,
                for (i = 0; (i < BOND_MAX_ARP_TARGETS); i++) {
                        if (targets[i] == newtarget) {
                                printk(KERN_INFO DRV_NAME
-                                      ": %s: removing ARP target %d.%d.%d.%d.\n",
-                                      bond->dev->name, NIPQUAD(newtarget));
+                                      ": %s: removing ARP target %pI4.\n",
+                                      bond->dev->name, &newtarget);
                                targets[i] = 0;
                                done = 1;
                        }
                }
                if (!done) {
                        printk(KERN_INFO DRV_NAME
-                              ": %s: unable to remove nonexistent ARP target %d.%d.%d.%d.\n",
-                              bond->dev->name, NIPQUAD(newtarget));
+                              ": %s: unable to remove nonexistent ARP target %pI4.\n",
+                              bond->dev->name, &newtarget);
                        ret = -EINVAL;
                        goto out;
                }
@@ -1395,13 +1391,11 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 {
        int count = 0;
        struct bonding *bond = to_bond(d);
-       DECLARE_MAC_BUF(mac);
 
        if (bond->params.mode == BOND_MODE_8023AD) {
                struct ad_info ad_info;
                if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                       count = sprintf(buf,"%s\n",
-                                       print_mac(mac, ad_info.partner_system));
+                       count = sprintf(buf, "%pM\n", ad_info.partner_system);
                }
        }
 
@@ -1447,19 +1441,9 @@ static struct attribute_group bonding_group = {
  */
 int bond_create_sysfs(void)
 {
-       int ret = 0;
-       struct bonding *firstbond;
-
-       /* get the netdev class pointer */
-       firstbond = container_of(bond_dev_list.next, struct bonding, bond_list);
-       if (!firstbond)
-               return -ENODEV;
+       int ret;
 
-       netdev_class = firstbond->dev->dev.class;
-       if (!netdev_class)
-               return -ENODEV;
-
-       ret = class_create_file(netdev_class, &class_attr_bonding_masters);
+       ret = netdev_class_create_file(&class_attr_bonding_masters);
        /*
         * Permit multiple loads of the module by ignoring failures to
         * create the bonding_masters sysfs file.  Bonding devices
@@ -1478,10 +1462,6 @@ int bond_create_sysfs(void)
                        printk(KERN_ERR
                               "network device named %s already exists in sysfs",
                               class_attr_bonding_masters.attr.name);
-               else {
-                       netdev_class = NULL;
-                       return 0;
-               }
        }
 
        return ret;
@@ -1493,8 +1473,7 @@ int bond_create_sysfs(void)
  */
 void bond_destroy_sysfs(void)
 {
-       if (netdev_class)
-               class_remove_file(netdev_class, &class_attr_bonding_masters);
+       netdev_class_remove_file(&class_attr_bonding_masters);
 }
 
 /*